From: Sascha Wildner <saw@online.de>
Date: Fri, 15 Apr 2011 12:40:46 +0000 (+0200)
Subject: More fixes for snapshot building.
X-Git-Tag: v2.11.0~52
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/1a0dc46030da7d07485e3068333b003861ac807b

More fixes for snapshot building.
---

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 8f3f08dc0b..93fe0c75b0 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -343,8 +343,7 @@ customizeiso:
 	test -e ${ISODIR}/.didbootstrap || \
 	    ${CHROOT_CMD} "cd /usr/pkgsrc/bootstrap;    \
 		export share_dir=/usr/pkgobj/bootstrap/work/share; \
-		export USE_DESTDIR=no; \
-		./bootstrap --workdir /usr/pkgobj/bootstrap/work"
+		env USE_DESTDIR=no ./bootstrap --workdir /usr/pkgobj/bootstrap/work"
 	test -e ${ISODIR}/.didbootstrap || \
 	    echo ".ifdef BSD_PKG_MK	# added by nrelease" \
 		>> ${ISOROOT}/usr/pkg/etc/mk.conf
@@ -370,7 +369,7 @@ customizeiso:
 .for PKG in ${PKGSRC_PACKAGES}
 	${CHROOT_CMD} "cd /usr/pkgsrc/${PKG} && \
 	    (bmake check > /dev/null 2>&1 || \
-	    bmake ${PKGSRC_OPTIONS} clean build install)"
+	    env USE_DESTDIR=no bmake ${PKGSRC_OPTIONS} clean build install)"
 .endfor
 	#
 	# Remove packages which nothing depends on, add a whatis database