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

specified in the top level Makefiles.

16 files changed, 26 insertions, 26 deletions

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>