Change `install' to `${INSTALL}' so that default install flags can be

specified in the top level Makefiles.

77 files changed, 136 insertions, 135 deletions

diff --git a/games/atc/Makefile b/games/atc/Makefile
index e6433c4..80305a1 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -12,7 +12,7 @@ CLEANFILES=grammar.c y.tab.h lex.c
 HIDEGAME=hidegame
 
 beforeinstall:
-	(cd ${.CURDIR}/games; install -c -o ${BINOWN} -g ${BINGRP} -m 400 \
+	(cd ${.CURDIR}/games; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 400 \
 	    ${GAMES} ${DESTDIR}/usr/share/games/atc)
 
 .include <bsd.prog.mk>
diff --git a/games/caesar/Makefile b/games/caesar/Makefile
index 13ff87d..2c1ff10 100644
--- a/games/caesar/Makefile
+++ b/games/caesar/Makefile
@@ -7,7 +7,7 @@ LDADD=	-lm
 MLINKS=	caesar.6 rot13.6
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/rot13.sh ${DESTDIR}/usr/games/rot13
 
 .include <bsd.prog.mk>
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index bb5ab6a..5d93bf6 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -8,7 +8,7 @@ MAN6=	cribbage.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/cribbage.n \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/cribbage.n \
 	    ${DESTDIR}/usr/share/games/cribbage.instr
 
 .include <bsd.prog.mk>
diff --git a/games/fish/Makefile b/games/fish/Makefile
index a57454f..fa2e419 100644
--- a/games/fish/Makefile
+++ b/games/fish/Makefile
@@ -5,7 +5,7 @@ MAN6=	fish.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/fish.instr \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/fish.instr \
 	    ${DESTDIR}/usr/share/games/fish.instr
 
 .include <bsd.prog.mk>
diff --git a/games/hack/Makefile b/games/hack/Makefile
index 6e9511c..037c24b 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -25,11 +25,11 @@ makedefs: makedefs.c
 	${CC} ${CFLAGS} -o ${.TARGET} ${.CURDIR}/${.PREFIX}.c
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 666 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 666 /dev/null \
 	    ${DESTDIR}/var/games/hackdir/perm
-	install -c -o ${BINOWN} -g ${BINGRP} -m 666 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 666 /dev/null \
 	    ${DESTDIR}/var/games/hackdir/record
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/help \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/help \
 	    ${.CURDIR}/hh ${.CURDIR}/data ${DESTDIR}/var/games/hackdir
 	rm -f ${DESTDIR}/var/games/hackdir/bones*
 
diff --git a/games/larn/Makefile b/games/larn/Makefile
index 78d3e10..4aab5e7 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -62,8 +62,8 @@ LDADD=	-ltermcap -lcompat
 HIDEGAME=hidegame
 
 beforeinstall:
-	(cd ${.CURDIR}/datfiles; install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    larnmaze larnopts larn.help \
+	(cd ${.CURDIR}/datfiles; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
+	    -m 444 larnmaze larnopts larn.help \
 	    ${DESTDIR}/usr/share/games/larn)
 
 .include <bsd.prog.mk>
diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile
index 7c61916..8e6eccc 100644
--- a/games/phantasia/Makefile
+++ b/games/phantasia/Makefile
@@ -16,16 +16,16 @@ setup: phantglobs.o setup.o monsters.asc ${LIBM}
 
 beforeinstall:
 	./setup -m ${.CURDIR}/monsters.asc
-	install -c -m 660 -o games -g bin gold ${DESTDIR}/var/games/phantasia
-	install -c -m 660 -o games -g bin lastdead ${DESTDIR}/var/games/phantasia
-	install -c -m 660 -o games -g bin mess ${DESTDIR}/var/games/phantasia
-	install -c -m 660 -o games -g bin monsters ${DESTDIR}/var/games/phantasia
-	install -c -m 660 -o games -g bin motd ${DESTDIR}/var/games/phantasia
-	install -c -m 660 -o games -g bin characs ${DESTDIR}/var/games/phantasia
-	install -c -m 660 -o games -g bin scoreboard ${DESTDIR}/var/games/phantasia
-	install -c -m 660 -o games -g bin void ${DESTDIR}/var/games/phantasia
-
-# Make Phantasia map.  Change the map commands reflect your installation.
+	${INSTALL} -c -m 660 -o games -g bin gold ${DESTDIR}/var/games/phantasia
+	${INSTALL} -c -m 660 -o games -g bin lastdead ${DESTDIR}/var/games/phantasia
+	${INSTALL} -c -m 660 -o games -g bin mess ${DESTDIR}/var/games/phantasia
+	${INSTALL} -c -m 660 -o games -g bin monsters ${DESTDIR}/var/games/phantasia
+	${INSTALL} -c -m 660 -o games -g bin motd ${DESTDIR}/var/games/phantasia
+	${INSTALL} -c -m 660 -o games -g bin characs ${DESTDIR}/var/games/phantasia
+	${INSTALL} -c -m 660 -o games -g bin scoreboard ${DESTDIR}/var/games/phantasia
+	${INSTALL} -c -m 660 -o games -g bin void ${DESTDIR}/var/games/phantasia
+
+# Make Phantasia map.  Change the map commands reflect your ${INSTALL}ation.
 # PLOTDEVICE is used for plotting the map.  Change as appropriate.
 
 map: map.c
diff --git a/games/quiz/Makefile b/games/quiz/Makefile
index 8044644..fabca7f 100644
--- a/games/quiz/Makefile
+++ b/games/quiz/Makefile
@@ -10,7 +10,7 @@ CATS=	africa america areas arith asia babies bard chinese collectives \
 HIDEGAME=hidegame
 
 beforeinstall:
-	(cd ${.CURDIR}/datfiles; install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${CATS} ${DESTDIR}/usr/share/games/quiz.db)
+	(cd ${.CURDIR}/datfiles; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
+	    -m 444 ${CATS} ${DESTDIR}/usr/share/games/quiz.db)
 
 .include <bsd.prog.mk>
diff --git a/games/robots/Makefile b/games/robots/Makefile
index 7e9af46..bded134 100644
--- a/games/robots/Makefile
+++ b/games/robots/Makefile
@@ -10,7 +10,7 @@ LDADD=	-lcurses -ltermcap -lcompat
 HIDEGAME=hidegame
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
 	    ${DESTDIR}/var/games/robots_roll
 
 .include <bsd.prog.mk>
diff --git a/games/wargames/Makefile b/games/wargames/Makefile
index 6246697..56713f2 100644
--- a/games/wargames/Makefile
+++ b/games/wargames/Makefile
@@ -4,7 +4,7 @@ NOOBJ=	noobj
 all wargames clean cleandir depend lint tags:
 
 install:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} wargames.sh \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} wargames.sh \
 	    ${DESTDIR}/usr/games/wargames
 
 .include <bsd.prog.mk>
diff --git a/games/wump/Makefile b/games/wump/Makefile
index de09ffb..a4ccedc 100644
--- a/games/wump/Makefile
+++ b/games/wump/Makefile
@@ -5,7 +5,7 @@ MAN6=	wump.6
 HIDEGAME=hidegame
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/wump.info \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/wump.info \
 	    ${DESTDIR}/usr/share/games
 
 .include <bsd.prog.mk>
diff --git a/gnu/games/chess/Makefile b/gnu/games/chess/Makefile
index a129137..a40e597 100644
--- a/gnu/games/chess/Makefile
+++ b/gnu/games/chess/Makefile
@@ -9,7 +9,7 @@ LDADD=	-lcurses -ltermcap
 HIDEGAME=hidegame
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/gnuchess.book \
-	    ${DESTDIR}/usr/share/games
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    ${.CURDIR}/gnuchess.book ${DESTDIR}/usr/share/games
 
 .include <bsd.prog.mk>
diff --git a/gnu/libexec/uucp/sample/Makefile b/gnu/libexec/uucp/sample/Makefile
index da21898..ad78f12 100644
--- a/gnu/libexec/uucp/sample/Makefile
+++ b/gnu/libexec/uucp/sample/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1993/10/14 12:18:29 rgrimes Exp $
+# $Id: Makefile,v 1.2 1994/04/25 16:17:59 jkh Exp $
 
 FILES=	call.sample config.sample dial.sample dialcode.sample passwd.sample \
 	port.sample sys1.sample sys2.sample
@@ -11,7 +11,7 @@ BINGRP=	$(group)
 all clean cleandir depend lint tags:
 
 install:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 440 ${FILES} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 440 ${FILES} \
 		${DESTDIR}/etc/uucp
 
 .include <bsd.prog.mk>
diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile
index 152ef5a..a18430a 100644
--- a/gnu/libexec/uucp/uusched/Makefile
+++ b/gnu/libexec/uucp/uusched/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uusched
-# $Id: Makefile,v 1.6 1995/01/24 17:58:35 bde Exp $
+# $Id: Makefile,v 1.7 1995/05/13 12:57:43 ache Exp $
 
 BINDIR=		$(bindir)
 CLEANFILES+=	$(ONESHPROG)
@@ -12,7 +12,7 @@ $(ONESHPROG): $(ONESHPROG).in Makefile
 		$(.ALLSRC:N*Makefile) > $(.TARGET)
 
 beforeinstall:
-	install -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \
+	${INSTALL} -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \
 		$(ONESHPROG) $(DESTDIR)$(BINDIR)/$(ONESHPROG)
 
 .include <bsd.prog.mk>
diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile
index f020965..8fa6d0a 100644
--- a/gnu/libexec/uucp/uuto/Makefile
+++ b/gnu/libexec/uucp/uuto/Makefile
@@ -1,5 +1,5 @@
 # Makefile for uuto
-# $Id: Makefile,v 1.4 1995/01/24 17:58:47 bde Exp $
+# $Id: Makefile,v 1.5 1995/05/13 12:57:44 ache Exp $
 
 BINDIR=		$(bindir)
 CLEANFILES+=	$(ONESHPROG)
@@ -12,7 +12,7 @@ $(ONESHPROG): $(ONESHPROG).in Makefile
 		$(.ALLSRC:N*Makefile) > $(.TARGET)
 
 beforeinstall:
-	install -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \
+	${INSTALL} -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \
 		$(ONESHPROG) $(DESTDIR)$(BINDIR)/$(ONESHPROG)
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cvs/cvsinit/Makefile b/gnu/usr.bin/cvs/cvsinit/Makefile
index da498fc..870fb77 100644
--- a/gnu/usr.bin/cvs/cvsinit/Makefile
+++ b/gnu/usr.bin/cvs/cvsinit/Makefile
@@ -1,7 +1,7 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1994/10/22 04:51:39 nate Exp $
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/cvsinit.sh ${DESTDIR}${BINDIR}/cvsinit
 
 .include "../../Makefile.inc"
diff --git a/gnu/usr.bin/cvs/examples/Makefile b/gnu/usr.bin/cvs/examples/Makefile
index edb1cdc..dbc997e 100644
--- a/gnu/usr.bin/cvs/examples/Makefile
+++ b/gnu/usr.bin/cvs/examples/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1995/02/22 21:49:46 roberto Exp $
+# $Id: Makefile,v 1.1 1995/04/08 17:50:48 nate Exp $
 
 CVSFILES= commitinfo loginfo rcsinfo editinfo modules
 
@@ -11,7 +11,7 @@ all clean:
 
 install:
 	cd ${.CURDIR}; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${CVSFILES} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${CVSFILES} \
 		${DESTDIR}${EXAMPDIR}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/Makefile.dev b/gnu/usr.bin/groff/Makefile.dev
index 4f6948f..36c3f30 100644
--- a/gnu/usr.bin/groff/Makefile.dev
+++ b/gnu/usr.bin/groff/Makefile.dev
@@ -22,7 +22,7 @@ maninstall:
 install:
 	for f in $(FONTFILES); do \
 		ff=$$f; test -f $$f || ff=${.CURDIR}/$$f || true; \
-		install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \
+		$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \
 			$(DESTDIR)$(DEVICEDIR)/$$f; \
 	done
 .endif
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index 4f6948f..36c3f30 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -22,7 +22,7 @@ maninstall:
 install:
 	for f in $(FONTFILES); do \
 		ff=$$f; test -f $$f || ff=${.CURDIR}/$$f || true; \
-		install -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \
+		$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \
 			$(DESTDIR)$(DEVICEDIR)/$$f; \
 	done
 .endif
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile
index be2bb8f..32282af 100644
--- a/gnu/usr.bin/groff/indxbib/Makefile
+++ b/gnu/usr.bin/groff/indxbib/Makefile
@@ -14,7 +14,7 @@ CLEANFILES+=	${MANDEPEND}
 # Sigh... Hardcode it.  	- jkh
 #
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/eign \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/eign \
 		${DESTDIR}${SHAREDIR}/dict
 
 .include "../Makefile.cfg"
diff --git a/gnu/usr.bin/groff/nroff/Makefile b/gnu/usr.bin/groff/nroff/Makefile
index 8998b2d..6758dd4 100644
--- a/gnu/usr.bin/groff/nroff/Makefile
+++ b/gnu/usr.bin/groff/nroff/Makefile
@@ -4,9 +4,9 @@ MANDEPEND=	nroff.1
 CLEANFILES+=	${MANDEPEND}
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		$(.CURDIR)/nroff.sh $(DESTDIR)$(BINDIR)/nroff
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		$(.CURDIR)/psroff.sh $(DESTDIR)$(BINDIR)/psroff
 
 .include <../Makefile.cfg>
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 2c88f3b..c9ca259 100644
--- a/gnu/usr.bin/groff/tmac/Makefile
+++ b/gnu/usr.bin/groff/tmac/Makefile
@@ -22,26 +22,26 @@ MDOCFILES=	doc-common doc-ditroff doc-nroff doc-syms
 
 beforeinstall:
 	for f in ${FILES}; do \
-		install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+		${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 			${.CURDIR}/$$f ${DESTDIR}${TMACDIR}; \
 	done
 	sed -f ${.CURDIR}/strip.sed ${.CURDIR}/tmac.an >tmac.groff_an
-	install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+	${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 		tmac.groff_an ${DESTDIR}${TMACDIR}
 	for f in ${STRIPFILES}; do \
 		rm -f temp; \
 	  	sed -f ${.CURDIR}/strip.sed ${.CURDIR}/$$f >temp; \
-		install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+		${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 			temp ${DESTDIR}${TMACDIR}/$$f; \
 	done
 	for f in ${MDOCFILES}; do \
 		rm -f temp; \
 		sed -f ${.CURDIR}/strip.sed ${.CURDIR}/$$f >temp; \
-		install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+		${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 			temp ${DESTDIR}${MDOCDIR}/$$f; \
 	done
 	test -f ${DESTDIR}${TMACDIR}/man.local || \
-		install -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
+		${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \
 			${.CURDIR}/man.local ${DESTDIR}${TMACDIR}
 
 .include "../Makefile.cfg"
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 61a237c..fff2823 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -17,9 +17,9 @@ majorminor.cc: ${.CURDIR}/../VERSION
 	\"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' ${.CURDIR}/../VERSION`\"\; >>$@
 
 afterinstall:
-	install -c -o bin -g bin -m 444 ${.CURDIR}/hyphen.us \
+	${INSTALL} -c -o bin -g bin -m 444 ${.CURDIR}/hyphen.us \
 		${DESTDIR}${tmacdir}/hyphen.us
-	install -c -o bin -g bin -m 444 ${.CURDIR}/hyphen.us-ru \
+	${INSTALL} -c -o bin -g bin -m 444 ${.CURDIR}/hyphen.us-ru \
 		${DESTDIR}${tmacdir}/hyphen.us-ru
 
 .include "../Makefile.cfg"
diff --git a/gnu/usr.bin/groff/xditview/Makefile b/gnu/usr.bin/groff/xditview/Makefile
index 24bf879..3c6d2b6 100644
--- a/gnu/usr.bin/groff/xditview/Makefile
+++ b/gnu/usr.bin/groff/xditview/Makefile
@@ -21,7 +21,7 @@ DPADD+=		${X11BASE}/lib/libXaw.a ${X11BASE}/lib/libXmu.a \
 		${X11BASE}/lib/libX11.a
 
 afterinstall:
-		install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${.CURDIR}/GXditview.ad \
 		${DESTDIR}${X11BASE}/lib/X11/app-defaults/GXditview
 .endif
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index e6f8652..19b9e0a 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -12,7 +12,7 @@ LINKS+= ${BINDIR}/gzip ${BINDIR}/zcat
 NOSHARED=yes
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	   ${.CURDIR}/zforce ${.CURDIR}/gzexe ${.CURDIR}/znew \
 	   ${.CURDIR}/zmore ${.CURDIR}/zdiff ${.CURDIR}/zgrep \
 	   ${DESTDIR}${BINDIR}
diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile
index bc6bdec..a13f02a 100644
--- a/gnu/usr.bin/man/apropos/Makefile
+++ b/gnu/usr.bin/man/apropos/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 1994/06/05 21:57:03 csgr Exp $
+# $Id: Makefile,v 1.8 1994/08/28 18:33:42 bde Exp $
 
 .if exists(${.CURDIR}/obj)
 MAN1=  ${.CURDIR}/obj/apropos.1
@@ -29,7 +29,7 @@ ${MAN1}: ${.CURDIR}/apropos.man
 		${.CURDIR}/apropos.man > ${.TARGET}
 
 install: ${TARG} maninstall
-	install -c -o bin -g bin -m 555 ${TARG} ${DESTDIR}/usr/bin
+	${INSTALL} -c -o bin -g bin -m 555 ${TARG} ${DESTDIR}/usr/bin
 
 .include "../Makefile.inc"
 
diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index 970f442..899756c 100644
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -25,6 +25,7 @@ ${MAN1}: ${.CURDIR}/manpath.man
 	${.CURDIR}/manpath.man > ${MAN1}
 
 afterinstall:
-	install -c -o bin -g bin -m 644 ${.CURDIR}/manpath.config ${DESTDIR}${manpath_config_file}.sample
+	${INSTALL} -c -o bin -g bin -m 644 ${.CURDIR}/manpath.config \
+	    ${DESTDIR}${manpath_config_file}.sample
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/man/whatis/Makefile b/gnu/usr.bin/man/whatis/Makefile
index 4a825c8..8ca53db 100644
--- a/gnu/usr.bin/man/whatis/Makefile
+++ b/gnu/usr.bin/man/whatis/Makefile
@@ -27,7 +27,7 @@ ${MAN1}: ${.CURDIR}/whatis.man
 		${.CURDIR}/whatis.man > ${.TARGET}
 
 install: ${TARG} maninstall
-	install -c -o bin -g bin -m 555 ${TARG} ${DESTDIR}/usr/bin
+	${INSTALL} -c -o bin -g bin -m 555 ${TARG} ${DESTDIR}/usr/bin
 
 .include "../Makefile.inc"
 .if make(maninstall) || make(install)
diff --git a/gnu/usr.bin/perl/lib/Makefile b/gnu/usr.bin/perl/lib/Makefile
index 387824b..76398c8 100644
--- a/gnu/usr.bin/perl/lib/Makefile
+++ b/gnu/usr.bin/perl/lib/Makefile
@@ -9,7 +9,7 @@ PLIB+= stat.pl syslog.pl termcap.pl timelocal.pl validate.pl
 NOOBJ=
 
 install:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${PLIB} ${PLIBDIR}
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${PLIB} ${PLIBDIR}
 
 clean:
 cleandir:
diff --git a/gnu/usr.bin/perl/x2p/Makefile b/gnu/usr.bin/perl/x2p/Makefile
index cc6c2fe..8057dfb 100644
--- a/gnu/usr.bin/perl/x2p/Makefile
+++ b/gnu/usr.bin/perl/x2p/Makefile
@@ -11,9 +11,9 @@ DPADD= ${LIBM}
 MAN1+= a2p.1 s2p.1 h2ph.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 ${.CURDIR}/s2p \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 ${.CURDIR}/s2p \
 		${DESTDIR}${BINDIR}
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 ${.CURDIR}/h2ph \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 ${.CURDIR}/h2ph \
 		${DESTDIR}${BINDIR}
 
 afterinstall:
diff --git a/gnu/usr.bin/rcs/rcsfreeze/Makefile b/gnu/usr.bin/rcs/rcsfreeze/Makefile
index c1b4841..a71f9d7 100644
--- a/gnu/usr.bin/rcs/rcsfreeze/Makefile
+++ b/gnu/usr.bin/rcs/rcsfreeze/Makefile
@@ -1,7 +1,7 @@
 MAN1=	rcsfreeze.1
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/rcsfreeze.sh ${DESTDIR}${BINDIR}/rcsfreeze
 
 .include "../../Makefile.inc"
diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile
index a3a765b..5504a1c 100644
--- a/gnu/usr.bin/send-pr/Makefile
+++ b/gnu/usr.bin/send-pr/Makefile
@@ -24,9 +24,9 @@ send-pr.el:	send-pr-el.in Makefile
 	    ${.ALLSRC:N*Makefile} > ${.TARGET}
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		send-pr ${DESTDIR}${BINDIR}/send-pr
-	install -c -o ${BINOWN} -g ${BINGRP} -m 0644 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 0644 \
 		${.CURDIR}/categories  ${DESTDIR}/etc/gnats/freefall
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.sbin/yppasswdd/Makefile b/gnu/usr.sbin/yppasswdd/Makefile
index b2109f6..499405f 100644
--- a/gnu/usr.sbin/yppasswdd/Makefile
+++ b/gnu/usr.sbin/yppasswdd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1995/04/01 19:23:11 wpaul Exp $
+# $Id: Makefile,v 1.6 1995/07/19 17:44:32 wpaul Exp $
 # @(#)Makefile	8.3 (Berkeley) 4/2/94
 
 PROG=	yppasswdd
@@ -12,7 +12,7 @@ CFLAGS+=-DCRYPT -I${.CURDIR} -I${.CURDIR}/../../../usr.sbin/vipw \
 CFLAGS+=-DVERSION=\"0.7\" -DYPLIBDIR=\"/usr/libexec\" -D_GNU_SOURCE
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/yppwupdate \
 		${DESTDIR}/usr/libexec/yppwupdate
 
diff --git a/gnu/usr.sbin/ypserv/Makefile b/gnu/usr.sbin/ypserv/Makefile
index 3138c17..edc8ac0 100644
--- a/gnu/usr.sbin/ypserv/Makefile
+++ b/gnu/usr.sbin/ypserv/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 1995/02/15 04:33:52 wpaul Exp $
+# $Id: Makefile,v 1.7 1995/07/12 16:28:10 wpaul Exp $
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
 
 PROG=	ypserv
@@ -10,10 +10,10 @@ CFLAGS+=-DMAX_CHILDREN=20 -DINSTDIR='"/usr/libexec"'
 MAN8= ypserv.8
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${.CURDIR}/Makefile.yp \
 		${DESTDIR}/var/yp/Makefile
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/mknetid \
 		${DESTDIR}/usr/libexec/mknetid
 
diff --git a/sbin/nologin/Makefile b/sbin/nologin/Makefile
index 5d89fff..5d2da43 100644
--- a/sbin/nologin/Makefile
+++ b/sbin/nologin/Makefile
@@ -5,7 +5,7 @@ MAN8=	nologin.8
 nologin clean depend lint tags:
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/nologin.sh ${DESTDIR}/sbin/nologin
 
 .include <bsd.prog.mk>
diff --git a/share/dict/Makefile b/share/dict/Makefile
index 7938233..b5ef308 100644
--- a/share/dict/Makefile
+++ b/share/dict/Makefile
@@ -7,7 +7,7 @@ NOOBJ=	noobj
 all clean cleandir depend lint tags:
 
 install:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
 	    ${DESTDIR}${BINDIR}/dict
 	(cd ${DESTDIR}${BINDIR}/dict; rm -f words; ln -s web2 words)
 
diff --git a/share/me/Makefile b/share/me/Makefile
index b86fa7a..b4ca882 100644
--- a/share/me/Makefile
+++ b/share/me/Makefile
@@ -19,7 +19,7 @@ beforeinstall:
 		chown ${BINOWN}.${BINGRP} ${DESTDIR}${TMLIB}/$$i; \
 		chmod 444 ${DESTDIR}${TMLIB}/$$i; \
 	done
-	cd ${.CURDIR}; install -c -o ${BINOWN} -g ${BINGRP} -m 444 revisions \
-	    ${DESTDIR}${MELIB}/revisions
+	cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    revisions ${DESTDIR}${MELIB}/revisions
 
 .include <bsd.prog.mk>
diff --git a/share/misc/Makefile b/share/misc/Makefile
index 3b59d71..7a6557c 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -8,7 +8,7 @@ NOOBJ=	noobj
 all clean cleandir depend lint tags:
 
 install:
-	cd ${.CURDIR}; install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
-	    ${DESTDIR}${BINDIR}/misc
+	cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    ${FILES} ${DESTDIR}${BINDIR}/misc
 
 .include <bsd.prog.mk>
diff --git a/share/mk/Makefile b/share/mk/Makefile
index f652575..67fc476 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1995/01/03 06:32:10 bde Exp $
+#	$Id: Makefile,v 1.7 1995/05/09 10:12:16 rgrimes Exp $
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
 
 FILES=	bsd.README
@@ -11,7 +11,7 @@ NOOBJ=	noobj
 all clean cleandir depend lint tags:
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
 	    ${DESTDIR}${BINDIR}/mk
 
 .include <bsd.prog.mk>
diff --git a/share/sgml/FreeBSD/dtd/Makefile b/share/sgml/FreeBSD/dtd/Makefile
index 38b2e2e..6e3fbb5 100644
--- a/share/sgml/FreeBSD/dtd/Makefile
+++ b/share/sgml/FreeBSD/dtd/Makefile
@@ -1,4 +1,4 @@
-#	$Id:$
+#	$Id: Makefile,v 1.1.1.1 1995/05/09 23:19:46 jfieber Exp $
 
 FILES=	linuxdoc linuxdoc.dec
 NOOBJ=	noobj
@@ -6,7 +6,7 @@ NOOBJ=	noobj
 all clean cleandir depend lint tags:
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
 	    ${DESTDIR}${BINDIR}/dtd
 
 .include <bsd.prog.mk>
diff --git a/share/sgml/FreeBSD/lib/Makefile b/share/sgml/FreeBSD/lib/Makefile
index 666750a..1f2e4e0 100644
--- a/share/sgml/FreeBSD/lib/Makefile
+++ b/share/sgml/FreeBSD/lib/Makefile
@@ -1,4 +1,4 @@
-#	$Id:$
+#	$Id: Makefile,v 1.1.1.1 1995/05/09 23:19:46 jfieber Exp $
 
 FILES=	linuxdoc.sty
 NOOBJ=	noobj
@@ -6,7 +6,7 @@ NOOBJ=	noobj
 all clean cleandir depend lint tags:
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
 	    ${DESTDIR}${BINDIR}/lib
 
 .include <bsd.prog.mk>
diff --git a/share/sgml/FreeBSD/rep/Makefile b/share/sgml/FreeBSD/rep/Makefile
index e1a112e..3ecb8a4 100644
--- a/share/sgml/FreeBSD/rep/Makefile
+++ b/share/sgml/FreeBSD/rep/Makefile
@@ -1,4 +1,4 @@
-#	$Id:$
+#	$Id: Makefile,v 1.1.1.1 1995/05/09 23:19:47 jfieber Exp $
 
 FILES=  html.general html.mapping html.math latex.general latex.mapping
 FILES+= latex.math nroff.general nroff.mapping nroff.math
@@ -7,7 +7,7 @@ NOOBJ=	noobj
 all clean cleandir depend lint tags:
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
 	    ${DESTDIR}${BINDIR}/rep
 
 .include <bsd.prog.mk>
diff --git a/share/skel/Makefile b/share/skel/Makefile
index e3996e2..6790bb8 100644
--- a/share/skel/Makefile
+++ b/share/skel/Makefile
@@ -6,7 +6,7 @@ NOOBJ=	noobj
 all clean cleandir depend lint tags:
 
 install:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
 	    ${DESTDIR}${BINDIR}/skel
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile
index 32a9086..7eb72b2 100644
--- a/share/syscons/fonts/Makefile
+++ b/share/syscons/fonts/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1995/02/22 21:49:46 roberto Exp $
+# $Id: Makefile,v 1.6 1995/05/30 06:58:14 rgrimes Exp $
 
 FONTS=	cp437-8x8.fnt cp437-8x14.fnt cp437-8x16.fnt \
 	cp437-thin-8x8.fnt cp437-thin-8x16.fnt \
@@ -22,7 +22,7 @@ all clean:
 
 install:
 	cd ${.CURDIR}; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FONTS} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FONTS} \
 		${DESTDIR}${FONTDIR}
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index ae04147..48cc7a1 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -11,7 +11,7 @@ all clean:
 
 install:
 	cd ${.CURDIR}; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${KEYMAPS} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${KEYMAPS} \
 			${DESTDIR}${MAPSDIR}
 
 .include <bsd.prog.mk>
diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile
index d27b4bb..8a43c3f 100644
--- a/share/syscons/scrnmaps/Makefile
+++ b/share/syscons/scrnmaps/Makefile
@@ -9,7 +9,7 @@ NOMAN = noman
 all: ${SCRMAPS}
 
 install:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SCRMAPS} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SCRMAPS} \
 		${DESTDIR}${SCRDIR}
 
 ${SCRMAPS}: ${.TARGET:R}.mk
diff --git a/share/tabset/Makefile b/share/tabset/Makefile
index d3226e4..7c08094 100644
--- a/share/tabset/Makefile
+++ b/share/tabset/Makefile
@@ -14,7 +14,7 @@ ${FILES}:
 depend lint tags:
 
 install:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
 	    ${DESTDIR}${BINDIR}/tabset
 
 .include <bsd.prog.mk>
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index a6cf922..b45670e 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -17,11 +17,11 @@ termcap.db: termcap
 	cap_mkdb termcap
 
 beforeinstall:
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap \
 	     ${DESTDIR}${BINDIR}/misc
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap.db \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap.db \
 	     ${DESTDIR}${BINDIR}/misc
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \
 	     ${DESTDIR}${BINDIR}/misc
 	@rm -f ${DESTDIR}/etc/termcap
 	ln -s ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
diff --git a/sys/i386/boot/biosboot/Makefile b/sys/i386/boot/biosboot/Makefile
index 7dfcf54..abc1993 100644
--- a/sys/i386/boot/biosboot/Makefile
+++ b/sys/i386/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.29 1995/04/20 18:36:13 phk Exp $
+#	$Id: Makefile,v 1.30 1995/04/20 23:15:03 joerg Exp $
 #
 
 PROG=	boot
@@ -58,9 +58,9 @@ boot2:		boot.nohdr
 all:		boot1 boot2
 
 install:
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
 		boot1 ${DESTDIR}${BINDIR}/boot1
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
 		boot2 ${DESTDIR}${BINDIR}/boot2
 	for i in sd fd wd ; do \
 		( cd ${DESTDIR}${BINDIR} ; \
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index afa891e..7b6e434 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -3,7 +3,7 @@
 PROG=	calendar
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}/usr/share/calendar
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/cpp/Makefile b/usr.bin/cpp/Makefile
index 645fb42..eda7f17 100644
--- a/usr.bin/cpp/Makefile
+++ b/usr.bin/cpp/Makefile
@@ -7,10 +7,10 @@ all nologin clean cleandir depend lint tags:
 
 beforeinstall:
 .if ${MACHINE} == "sparc"
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/cpp.notraditional.sh ${DESTDIR}/usr/bin/cpp
 .else
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/cpp.sh ${DESTDIR}/usr/bin/cpp
 .endif
 
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index a0b27d2..d2cd561 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$Id: Makefile,v 1.2 1994/09/03 19:31:14 csgr Exp $
+# @(#)$Id: Makefile,v 1.3 1995/05/30 06:29:57 rgrimes Exp $
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
@@ -51,7 +51,7 @@ magic:	$(MAGFILES)
 	cat $(MAGFILES) > $(.TARGET)
 
 afterinstall:
-	install -c -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) magic \
+	${INSTALL} -c -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) magic \
 	$(DESTDIR)$(MAGIC)
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile
index 0762b78..f8aa1f2 100644
--- a/usr.bin/gprof/Makefile
+++ b/usr.bin/gprof/Makefile
@@ -5,7 +5,7 @@ SRCS=	gprof.c arcs.c dfn.c lookup.c ${MACHINE}.c hertz.c \
 	printgprof.c printlist.c
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${.CURDIR}/gprof.flat ${.CURDIR}/gprof.callg \
 	    ${DESTDIR}/usr/share/misc
 
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index 741c6de..e828d69 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -5,9 +5,9 @@ MAN1=   id.1 groups.1 whoami.1
 
 # XXX BROKEN:	afterinstall:
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/groups.sh ${DESTDIR}/usr/bin/groups
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/whoami.sh ${DESTDIR}/usr/bin/whoami
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/keyinfo/Makefile b/usr.bin/keyinfo/Makefile
index 41baee6..3227586 100644
--- a/usr.bin/keyinfo/Makefile
+++ b/usr.bin/keyinfo/Makefile
@@ -3,7 +3,7 @@
 MAN1=	keyinfo.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/keyinfo.sh ${DESTDIR}${BINDIR}/keyinfo
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 2e6c696..928bc71 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -3,7 +3,7 @@
 PROG=	locate
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/updatedb.csh ${DESTDIR}/usr/libexec/locate.updatedb
 
 .include "../../Makefile.inc"
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index b9e67e5..ac2f642 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -11,9 +11,9 @@ LINKS=	${BINDIR}/mail ${BINDIR}/Mail
 MLINKS=	mail.1 Mail.1
 
 beforeinstall:
-	cd ${.CURDIR}/misc; install -c -o ${BINOWN} -g ${BINGRP} \
+	cd ${.CURDIR}/misc; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
 	    -m 444 ${SFILES} ${DESTDIR}/usr/share/misc
-	cd ${.CURDIR}/misc; install -c -o root -g wheel \
+	cd ${.CURDIR}/misc; ${INSTALL} -c -o root -g wheel \
 	    -m 644 ${EFILES} ${DESTDIR}/etc
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile
index 94c5d65..4329dc0 100644
--- a/usr.bin/mkdep/Makefile
+++ b/usr.bin/mkdep/Makefile
@@ -5,11 +5,11 @@ MAN1=	mkdep.1
 .if (${MACHINE} == "hp300" || ${MACHINE} == "i386" || \
 	${MACHINE} == "mips" || ${MACHINE} == "sparc")
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/mkdep.gcc.sh ${DESTDIR}/usr/bin/mkdep
 .else
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/mkdep.sh ${DESTDIR}/usr/bin/mkdep
 .endif
 
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index 534d160..aaccab0 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+#	$Id: Makefile,v 1.3 1995/02/21 03:46:45 wollman Exp $
 
 PROG=	more
 CFLAGS+=-I${.CURDIR} -DTERMIOS
@@ -10,7 +10,7 @@ DPADD=	${LIBTERMCAP}
 LDADD=	-ltermcap
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/more.help \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/more.help \
 	    ${DESTDIR}/usr/share/misc
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/sgmlfmt/Makefile b/usr.bin/sgmlfmt/Makefile
index 835c05f..8d761b4 100644
--- a/usr.bin/sgmlfmt/Makefile
+++ b/usr.bin/sgmlfmt/Makefile
@@ -1,9 +1,9 @@
-#	$Id:$
+#	$Id: Makefile,v 1.1.1.1 1995/05/09 23:58:06 jfieber Exp $
 
 MAN1=	sgmlfmt.1
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/sgmlfmt.pl ${DESTDIR}${BINDIR}/sgmlfmt
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 8e388be..79895df 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -3,7 +3,7 @@
 MAN1=	shar.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/shar.sh ${DESTDIR}/usr/bin/shar
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index abec983..45d369f 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -6,7 +6,7 @@ LDADD=	-ltermcap
 MLINKS=	tput.1 clear.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/clear.sh ${DESTDIR}/usr/bin/clear
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index 2c1e76b..ea692f6 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -14,13 +14,13 @@ ${EXTRA}: ${.CURDIR}/vgrindefs.src
 	cap_mkdb -f vgrindefs.src ${.CURDIR}/vgrindefs.src
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/vgrind.sh ${DESTDIR}/usr/bin/vgrind
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/vgrindefs.src \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/vgrindefs.src \
 	    ${DESTDIR}/usr/share/misc/vgrindefs
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    vgrindefs.src.db ${DESTDIR}/usr/share/misc/vgrindefs.db
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/tmac.vgrind \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/tmac.vgrind \
 	    ${DESTDIR}/usr/share/tmac
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 85fa801..d21abef 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -6,7 +6,7 @@ MAN1=	install.1
 .PATH:	${.CURDIR}/../../bin/ls
 
 install: maninstall
-	install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${PROG} ${DESTDIR}${BINDIR}/install
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index f5c4b9d..5ff2152 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -6,7 +6,7 @@ SRCS=	closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
 MAN1=	yacc.1 yyfix.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/yyfix.sh ${DESTDIR}${BINDIR}/yyfix
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile
index e60cd97..1bf5c1e 100644
--- a/usr.sbin/kbdmap/Makefile
+++ b/usr.sbin/kbdmap/Makefile
@@ -1,5 +1,5 @@
 # Makefile for kbdmap / vidfont
-# $Id: Makefile,v 1.3 1995/04/06 14:41:50 ache Exp $
+# $Id: Makefile,v 1.4 1995/07/17 14:43:06 jkh Exp $
 
 SCRIPT=	${.CURDIR}/kbdmap.pl
 LINKS=	${BINDIR}/kbdmap ${BINDIR}/vidfont
@@ -10,7 +10,7 @@ all:
 	@echo -n
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${SCRIPT} ${DESTDIR}${BINDIR}/kbdmap
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile
index cba34ee..b23be95 100644
--- a/usr.sbin/lpr/lp/Makefile
+++ b/usr.sbin/lpr/lp/Makefile
@@ -4,7 +4,7 @@ BINDIR = /usr/bin
 MAN1 = lp.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	     ${.CURDIR}/lp.sh ${DESTDIR}${BINDIR}/lp
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile
index 4c7f4dd..19b8baf 100644
--- a/usr.sbin/manctl/Makefile
+++ b/usr.sbin/manctl/Makefile
@@ -1,11 +1,11 @@
 # Makefile
-# $Id: Makefile,v 1.4 1994/05/26 20:16:49 csgr Exp $
+# $Id: Makefile,v 1.5 1995/07/17 14:39:09 jkh Exp $
 
 all:
 	@echo -n
 
 install: all
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 ${.CURDIR}/manctl.sh \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 ${.CURDIR}/manctl.sh \
 	${DESTDIR}${BINDIR}/manctl
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/named/tools/named.reload/Makefile b/usr.sbin/named/tools/named.reload/Makefile
index 5ebc77f..6df605d 100644
--- a/usr.sbin/named/tools/named.reload/Makefile
+++ b/usr.sbin/named/tools/named.reload/Makefile
@@ -7,7 +7,7 @@ PIDDIR=/var/run
 INDOT=
 
 beforeinstall:	named.reload
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    named.reload ${DESTDIR}${BINDIR}
 
 named.reload: named.reload.sh Makefile
diff --git a/usr.sbin/named/tools/named.restart/Makefile b/usr.sbin/named/tools/named.restart/Makefile
index 30e02c6..0c8773d 100644
--- a/usr.sbin/named/tools/named.restart/Makefile
+++ b/usr.sbin/named/tools/named.restart/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.1 (Berkeley) 5/28/90
-#	$Id$
+#	$Id: Makefile,v 1.3 1995/05/03 03:26:53 rgrimes Exp $
 
 MAN8=	named.restart.8
 CLEANFILES+=named.restart
@@ -8,7 +8,7 @@ PIDDIR=/var/run
 INDOT=
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    named.restart ${DESTDIR}${BINDIR}
 
 all: named.restart
diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile
index 5d89fff..5d2da43 100644
--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@@ -5,7 +5,7 @@ MAN8=	nologin.8
 nologin clean depend lint tags:
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/nologin.sh ${DESTDIR}/sbin/nologin
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile
index 4295c99..bb1f2b3 100644
--- a/usr.sbin/nslookup/Makefile
+++ b/usr.sbin/nslookup/Makefile
@@ -8,7 +8,7 @@ LDADD+=	-ll
 CLEANFILES+=lex.yy.o
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/nslookup.help \
-		${DESTDIR}/usr/share/misc
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${.CURDIR}/nslookup.help ${DESTDIR}/usr/share/misc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pcvt/fed/Makefile b/usr.sbin/pcvt/fed/Makefile
index 699a146..7c8a3c3 100644
--- a/usr.sbin/pcvt/fed/Makefile
+++ b/usr.sbin/pcvt/fed/Makefile
@@ -24,6 +24,6 @@ clean:
 	rm -f *.o fed *core* trace*
 
 install:	fed
-	install -c -s -o bin -g bin fed $(DEST)
+	${INSTALL} -c -s -o bin -g bin fed $(DEST)
 
 .endif
diff --git a/usr.sbin/pcvt/fonts/Makefile b/usr.sbin/pcvt/fonts/Makefile
index e59c513..6dedcb5 100644
--- a/usr.sbin/pcvt/fonts/Makefile
+++ b/usr.sbin/pcvt/fonts/Makefile
@@ -27,7 +27,7 @@ install: ${FONTS}
 	@if [ ! -d ${DESTDIR}${FONTDIR} ]; then mkdir ${DESTDIR}${FONTDIR};fi
 	@for i in ${FONTS}; do \
 		${ECHO} "installing font $$i into ${DESTDIR}${FONTDIR}"; \
-		install -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \
+		${INSTALL} -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \
 		$$i ${DESTDIR}${FONTDIR}; \
 	done
 
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index 83d363e..4cc876a 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -34,9 +34,9 @@ BINMODE=6555
 beforeinstall:
 #	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 #	    ${DESTDIR}/etc/sendmail.fc
-	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/log/sendmail.st
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
 	    ${DESTDIR}/usr/share/misc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/src/Makefile.FreeBSD b/usr.sbin/sendmail/src/Makefile.FreeBSD
index 3a94730..69a8db2 100644
--- a/usr.sbin/sendmail/src/Makefile.FreeBSD
+++ b/usr.sbin/sendmail/src/Makefile.FreeBSD
@@ -42,9 +42,9 @@ BINMODE=6555
 beforeinstall:
 #	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 #	    ${DESTDIR}/etc/sendmail.fc
-	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/log/sendmail.st
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
 	    ${DESTDIR}/usr/share/misc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile
index 5fb1a47..8816413 100644
--- a/usr.sbin/spkrtest/Makefile
+++ b/usr.sbin/spkrtest/Makefile
@@ -1,7 +1,7 @@
 MAN8=	spkrtest.8
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/spkrtest.pl ${DESTDIR}${BINDIR}/spkrtest
 
 .include <bsd.prog.mk>