diff --git a/tools/Makefile.gnuhost b/tools/Makefile.gnuhost
index 3ea2f230d5ad..95838dc6d549 100644
--- a/tools/Makefile.gnuhost
+++ b/tools/Makefile.gnuhost
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.gnuhost,v 1.8 2001/11/16 16:41:46 tv Exp $
+#	$NetBSD: Makefile.gnuhost,v 1.9 2001/11/19 04:47:42 perry Exp $
 #
 # Rules used when building a GNU host package.  Expects MODULE to be set.
 #
@@ -43,7 +43,7 @@ CONFIGURE_ENV+=	CC=${HOST_CC:Q} \
 		CPPFLAGS=${HOST_CPPFLAGS:Q} \
 		CXX=${HOST_CXX:Q} \
 		CXXFLAGS=${HOST_CXXFLAGS:Q} \
-		INSTALL=${INSTALL_FILE:N-U:Q} \
+		INSTALL=${HOST_INSTALL_FILE:Q} \
 		LDFLAGS=${HOST_LDFLAGS:Q} \
 		PATH="${TOOLDIR}/bin:$$PATH"
 
@@ -57,7 +57,7 @@ MAKE_ARGS:=	-f ${.PARSEDIR}/Makefile.gnuwrap ${MAKE_ARGS}
 MAKE_ARGS+=	_NOWRAPPER=1
 .endif
 
-MAKE_ARGS+=	LEX=true BISON=true DESTDIR= INSTALL=${INSTALL_FILE:N-U:Q}
+MAKE_ARGS+=	LEX=true BISON=true DESTDIR= INSTALL=${HOST_INSTALL_FILE:Q}
 
 ALL_TARGET?=	all
 INSTALL_TARGET?=install
diff --git a/tools/Makefile.host b/tools/Makefile.host
index 9b815b4fa55b..69a21d9fc6c1 100644
--- a/tools/Makefile.host
+++ b/tools/Makefile.host
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.host,v 1.10 2001/11/12 23:16:24 tv Exp $
+#	$NetBSD: Makefile.host,v 1.11 2001/11/19 04:47:42 perry Exp $
 
 .include <bsd.own.mk>
 
@@ -46,7 +46,7 @@ realinstall: install.host install.files
 install.host: ${HOST_BINDIR}/${HOSTPROGNAME}
 ${HOST_BINDIR}/${HOSTPROGNAME}:: ${HOSTPROG}
 	mkdir -p ${HOST_BINDIR}
-	${INSTALL_FILE:N-U} -m ${BINMODE} ${.ALLSRC} ${.TARGET}
+	${HOST_INSTALL_FILE} -m ${BINMODE} ${.ALLSRC} ${.TARGET}
 
 .if !defined(UPDATE)
 .PHONY:		${HOST_BINDIR}/${HOSTPROGNAME}
@@ -57,7 +57,7 @@ install.files:
 install.files: ${HOST_FILESDIR}/${F}
 ${HOST_FILESDIR}/${F}: ${F}
 	mkdir -p ${HOST_FILESDIR}
-	${INSTALL_FILE:N-U} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}
+	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}
 
 .if !defined(UPDATE)
 .PHONY:		${HOST_FILESDIR}/${F}
diff --git a/tools/groff/Makefile b/tools/groff/Makefile
index 609e53484ee1..41f224c974dd 100644
--- a/tools/groff/Makefile
+++ b/tools/groff/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2001/11/14 22:13:40 tv Exp $
+#	$NetBSD: Makefile,v 1.5 2001/11/19 04:47:43 perry Exp $
 
 MODULE=		groff
 
@@ -21,17 +21,17 @@ afterinstall:	${TMACDIR}/tmac.${F}
 ${TMACDIR}/tmac.${F}: ${F}
 .if defined(UPDATE)
 	@if ! cmp ${.ALLSRC} ${.TARGET} 2>/dev/null; then \
-		echo ${INSTALL_FILE:N-U:Q} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}; \
-		${INSTALL_FILE:N-U} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}; \
+		echo ${HOST_INSTALL_FILE:Q} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}; \
+		${HOST_INSTALL_FILE} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}; \
 	fi
 .else
-	${INSTALL_FILE:N-U} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}
+	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}
 .endif
 .endfor
 
 afterinstall: ${TMACDIR}/tmac.an
 ${TMACDIR}/tmac.an: ${TMACDIR}/tmac.andoc
-	${INSTALL_FILE:N-U} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}
+	${HOST_INSTALL_FILE} -m ${NONBINMODE} ${.ALLSRC} ${.TARGET}
 
 .for F in eqn groff indxbib pic refer soelim tbl
 afterinstall: ${TOOLDIR}/bin/nb${F}
diff --git a/tools/lorder/Makefile b/tools/lorder/Makefile
index ffa31db5b9da..20752af2c43e 100644
--- a/tools/lorder/Makefile
+++ b/tools/lorder/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2001/11/14 22:13:41 tv Exp $
+#	$NetBSD: Makefile,v 1.4 2001/11/19 04:47:43 perry Exp $
 
 TIMESTAMP=	${TOOLDIR}/bin/nblorder
 
@@ -8,4 +8,4 @@ TIMESTAMP=	${TOOLDIR}/bin/nblorder
 
 install: ${TIMESTAMP}
 ${TIMESTAMP}: lorder.sh
-	${INSTALL_FILE:N-U} -m ${BINMODE} ${.ALLSRC} ${.TARGET}
+	${HOST_INSTALL_FILE} -m ${BINMODE} ${.ALLSRC} ${.TARGET}