From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Fri, 30 Apr 2010 18:11:06 +0000 (-0700)
Subject: nrelease - MFC try to workaround a problem with ./bootstrap
X-Git-Tag: v2.6.3^0
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/cc628e36f101d0e940386d566db4982807fefed8

nrelease - MFC try to workaround a problem with ./bootstrap

* setenv share_dir during the bootstrap build to try to work around a
  problem where recent changes in the build cause bmake to try to access
  the system mk files in /usr/share/mk.
---

diff --git a/nrelease/Makefile b/nrelease/Makefile
index 2c4033d4ea..c7afd3a33d 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -369,6 +369,7 @@ customizeiso:
 		    ${ISOROOT}/var/db/pkg.refcount
 	test -e ${ISODIR}/.didbootstrap || \
 	    ${CHROOT_CMD} "cd /usr/pkgsrc/bootstrap;    \
+		export share_dir=/usr/pkgobj/bootstrap/work/share; \
 		./bootstrap --workdir /usr/pkgobj/bootstrap/work"
 .if make(gui)
 	test -e ${ISODIR}/.didbootstrap || \
@@ -488,7 +489,9 @@ realclean:	clean
 
 pkgsrc_bootstrap:
 	mkdir -p /usr/release/bootstrap
-	(cd ${PKGSRC_PATH}/bootstrap; ./bootstrap --workdir /usr/release/bootstrap)
+	(cd ${PKGSRC_PATH}/bootstrap; \
+	    export share_dir=/usr/release/bootstrap/share; \
+	    ./bootstrap --workdir /usr/release/bootstrap)
 
 pkgsrc_cdrecord:
 .if !exists (${PKGBIN_MKISOFS})