svn commit: r297598 - projects/release-pkg

[Glen Barber]

Author: gjb
Date: Tue Apr  5 23:24:17 2016
New Revision: 297598
URL: https://svnweb.freebsd.org/changeset/base/297598

Log:
  Fix errors packaging the base system when using non-default DESTDIR
  and MAKEOBJDIRPREFIX.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Tue Apr  5 22:36:48 2016	(r297597)
+++ projects/release-pkg/Makefile.inc1	Tue Apr  5 23:24:17 2016	(r297598)
@@ -1243,15 +1243,15 @@ real-packages:	stage-packages create-pac
 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