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

specified in the top level Makefiles.

23 files changed, 42 insertions, 41 deletions

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