aboutsummaryrefslogtreecommitdiff
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2000-01-11 16:23:51 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2000-01-11 16:23:51 +0000
commit15e1a3068c5c93d14054e6ba40c6eb1a46e7a2d9 (patch)
tree80f05996afa1c3740bd495623a4f0d12989720f0 /Makefile.inc1
parentd0e12656b8aa346cadc43f1caf4fd67febdde65b (diff)
downloadsrc-15e1a3068c5c93d14054e6ba40c6eb1a46e7a2d9.tar.gz
src-15e1a3068c5c93d14054e6ba40c6eb1a46e7a2d9.zip
Revert gratuitous change in rev. 1.123 which broke building world
as non-root. Breakage caused by: green
Notes
Notes: svn path=/head/; revision=55827
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc13
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 093d9bb9b5a4..969850be6289 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -142,6 +142,7 @@ TMPPATH= ${STRICTTMPPATH}:${PATH}
# Common environment for bootstrap related stages
BOOTSTRAPENV= MAKEOBJDIRPREFIX=${WORLDTMP} \
DESTDIR=${WORLDTMP} \
+ INSTALL="sh ${.CURDIR}/tools/install.sh" \
MACHINE_ARCH=${BUILD_ARCH} \
TOOLS_PREFIX=${WORLDTMP} \
PATH=${TMPPATH}
@@ -159,6 +160,7 @@ BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DNOMAN -DNOINFO -DNOHTML
# build-tool stage
TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \
+ INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH}
TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1
@@ -171,6 +173,7 @@ XMAKE= ${XMAKEENV} ${MAKE} -f Makefile.inc1 -DNOMAN -DNOINFO -DNOHTML \
# world stage
WMAKEENV= ${CROSSENV} \
DESTDIR=${WORLDTMP} \
+ INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH}
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1