From cc628e36f101d0e940386d566db4982807fefed8 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Fri, 30 Apr 2010 11:11:06 -0700 Subject: [PATCH] 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. --- nrelease/Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/nrelease/Makefile b/nrelease/Makefile index 2c4033d..c7afd3a 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}) -- 1.7.7.2