From 15e1a3068c5c93d14054e6ba40c6eb1a46e7a2d9 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Tue, 11 Jan 2000 16:23:51 +0000 Subject: [PATCH] Revert gratuitous change in rev. 1.123 which broke building world as non-root. Breakage caused by: green --- Makefile.inc1 | 3 +++ 1 file changed, 3 insertions(+) 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