diff options
author | marcel <marcel@FreeBSD.org> | 2000-01-11 16:23:51 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2000-01-11 16:23:51 +0000 |
commit | 092be34d9a2055e5d5620692f34b15403326f3cf (patch) | |
tree | 69f1f5a0c60020174b780f19b67e8673ed11be18 | |
parent | f9553029644c999af019267d6ce868430942e32e (diff) | |
download | FreeBSD-src-092be34d9a2055e5d5620692f34b15403326f3cf.zip FreeBSD-src-092be34d9a2055e5d5620692f34b15403326f3cf.tar.gz |
Revert gratuitous change in rev. 1.123 which broke building world
as non-root.
Breakage caused by: green
-rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 093d9bb..969850b 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 |