Fix errors packaging the base system when using non-default DESTDIR

and MAKEOBJDIRPREFIX.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
gjb 2016-04-05 23:24:17 +00:00
parent 1dc4c40e3b
commit 0fbf2c0dab

View File

@ -1243,15 +1243,15 @@ real-packages: stage-packages create-packages sign-packages
stage-packages:
@mkdir -p ${WSTAGEDIR} ${KSTAGEDIR}
${_+_}@cd ${.CURDIR}; \
${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} -DNO_ROOT -B stageworld ; \
${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel
${MAKE} DESTDIR=${WSTAGEDIR} -DNO_ROOT -B stageworld ; \
${MAKE} DESTDIR=${KSTAGEDIR} -DNO_ROOT -B stagekernel
create-packages: _pkgbootstrap
@mkdir -p ${REPODIR}
${_+_}@cd ${.CURDIR}; \
${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} \
${MAKE} DESTDIR=${WSTAGEDIR} \
PKG_VERSION=${PKG_VERSION} create-world-packages ; \
${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} \
${MAKE} DESTDIR=${KSTAGEDIR} \
PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
create-kernel-packages