From e13d6f8b3f1e6da25895f42f0e3321a23b4d2132 Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Wed, 25 Nov 2015 19:10:28 +0000
Subject: META MODE: Prefer INSTALL=tools/install.sh to lessen the need for
 xinstall.host.

This both avoids some dependencies on xinstall.host and allows
bootstrapping on older releases to work due to lack of at least 'install -l'
support.

Sponsored by:	EMC / Isilon Storage Division
---
 targets/pseudo/bootstrap-tools/Makefile | 10 ++++++----
 targets/pseudo/stage/Makefile           |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'targets')

diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index aa6166c..a9cdfe5 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -20,7 +20,8 @@ BSENV= \
 	MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \
 	TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \
 	WITHOUT_STAGING=1 STAGE_ROOT= BOOTSTRAPPING_TOOLS=1 \
-	WORLDTMP=${BTOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS}
+	WORLDTMP=${BTOOLSDIR} LEGACY_TOOLS=${LEGACY_TOOLS} \
+	INSTALL="sh ${SRCTOP}/tools/install.sh"
 
 .if !defined(OSRELDATE)
 ord_h= /usr/include/osreldate.h
@@ -41,11 +42,12 @@ BSARGS= 	DESTDIR= \
 		MK_LLDB=no MK_TESTS=no \
 		MK_INCLUDES=yes
 
+DISTRIB_ENV=	INSTALL="sh ${SRCTOP}/tools/install.sh" NO_FSCHG=1
 legacy: .MAKE .META
 	mkdir -p ${LEGACY_TOOLS}
-	${MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG DESTDIR=${BTOOLSDIR} \
-	    > $@.distrib-dirs_btoolsdir
-	${MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG \
+	${DISTRIB_ENV} ${MAKE} -C ${SRCTOP}/etc distrib-dirs \
+	    DESTDIR=${BTOOLSDIR} > $@.distrib-dirs_btoolsdir
+	${DISTRIB_ENV} ${MAKE} -C ${SRCTOP}/etc distrib-dirs \
 	    DESTDIR=${LEGACY_TOOLS} > $@.distrib-dirs_legacy_tools
 	${BSENV} ${MAKE} -C ${SRCTOP} -f Makefile.inc1 ${BSARGS} $@
 	touch $@
diff --git a/targets/pseudo/stage/Makefile b/targets/pseudo/stage/Makefile
index e1041a2..daa352d 100644
--- a/targets/pseudo/stage/Makefile
+++ b/targets/pseudo/stage/Makefile
@@ -8,8 +8,8 @@ all:
 # we don't need to see it.
 stage-distrib-dirs: .META
 	mkdir -p ${STAGE_OBJTOP}
-	${.MAKE} -C ${SRCTOP}/etc distrib-dirs -DNO_FSCHG -DWITH_TESTS \
-	    DESTDIR=${STAGE_OBJTOP} > $@.distrib_dirs
+	INSTALL="sh ${SRCTOP}/tools/install.sh" ${.MAKE} -C ${SRCTOP}/etc \
+	    distrib-dirs -DNO_FSCHG -DWITH_TESTS DESTDIR=${STAGE_OBJTOP}
 	touch $@
 
 .include <bsd.prog.mk>
-- 
cgit v1.1