From 0fbf2c0dab5e5c8490a06e915b67e939b0dce0b6 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Tue, 5 Apr 2016 23:24:17 +0000
Subject: [PATCH] Fix errors packaging the base system when using non-default
 DESTDIR and MAKEOBJDIRPREFIX.

Sponsored by:	The FreeBSD Foundation
---
 Makefile.inc1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 1eda64b9a24f..f804f52fba80 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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