D35809.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D35809.diff
View Options

	diff --git a/Makefile.inc1 b/Makefile.inc1
	--- a/Makefile.inc1
	+++ b/Makefile.inc1
	@@ -948,10 +948,12 @@
	IMAKE_MTREE= MTREE_CMD="${MTREE_CMD} ${MTREEFLAGS}"
	.endif
	.if make(distributeworld)
	-CERTCTLDESTDIR= ${DESTDIR}/${DISTDIR}/base
	+CERTCTLDESTDIR= ${DESTDIR}/${DISTDIR}
	+CERTCTLFLAGS+= -d /base
	.else
	CERTCTLDESTDIR= ${DESTDIR}
	.endif
	+CERTCTLFLAGS+= -D "${CERTCTLDESTDIR}"

	DESTDIR_MTREEFLAGS= -deU
	# When creating worldtmp we don't need to set the directories as owned by root
	@@ -1443,6 +1445,14 @@
	.endif # make(distributeworld)
	${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \
	${IMAKEENV} rm -rf ${INSTALLTMP}
	+.if !make(packageworld) && ${MK_CAROOT} != "no"
	+ @if which openssl>/dev/null; then \
	+ PATH=${TMPPATH}:${PATH} \
	+ sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash; \
	+ else \
	+ echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \
	+ fi
	+.endif
	.if make(distributeworld)
	.for dist in ${EXTRA_DISTRIBUTIONS}
	find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -type d -empty -delete
	@@ -1470,14 +1480,6 @@
	.endfor
	.endif
	.endif # make(distributeworld)
	-.if !make(packageworld) && ${MK_CAROOT} != "no"
	- @if which openssl>/dev/null; then \
	- DESTDIR=${CERTCTLDESTDIR} PATH=${TMPPATH}:${PATH} \
	- sh ${SRCTOP}/usr.sbin/certctl/certctl.sh ${CERTCTLFLAGS} rehash \
	- else \
	- echo "No openssl on the host, not rehashing certificates target -- /etc/ssl may not be populated."; \
	- fi
	-.endif

	packageworld: .PHONY
	.for dist in base ${EXTRA_DISTRIBUTIONS}