From 092be34d9a2055e5d5620692f34b15403326f3cf Mon Sep 17 00:00:00 2001
From: marcel <marcel@FreeBSD.org>
Date: Tue, 11 Jan 2000 16:23:51 +0000
Subject: 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(+)

(limited to 'Makefile.inc1')

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
 
-- 
cgit v1.1