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

specified in the top level Makefiles. Previously I missed dozens of Makefiles that skip the install after using `cmp -s' to decide that the install isn't necessary.
svn path=/head/; revision=9970
1995-08-06 12:24:38 +00:00 · 1995-08-06 12:24:38 +00:00 · 48cfb668fc · 2020-12-20 02:59:44 +00:00
commit 48cfb668fc
parent d63abe4172
22 changed files with 88 additions and 86 deletions
--- a/etc/Makefile
+++ b/etc/Makefile
@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.117 1995/05/30 03:57:47 rgrimes Exp $
+#	$Id: Makefile,v 1.118 1995/06/17 03:17:16 ache Exp $

 # disktab may be wrong -- hcx9 is a tahoe, but gets its own.
 # -rw-r--r--
@ -161,55 +161,55 @@ distribute:

 distribution:
 	(cd ${.CURDIR}; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 666 ${BIN2} ${DESTDIR}/etc; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 ${BIN3} ${DESTDIR}/etc; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 644 crontab ${DESTDIR}/etc; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc; \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 666 ${BIN2} ${DESTDIR}/etc; \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 ${BIN3} ${DESTDIR}/etc; \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 crontab ${DESTDIR}/etc; \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
 	    ${DESTDIR}/var/cron/log; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 600 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 \
 	    master.passwd ${DESTDIR}/etc; \
 	pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd; \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	     MAKEDEV.local etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev )
 	(cd ${DESTDIR}/dev; sh MAKEDEV all) ;
 	(cd ${.CURDIR}/root; \
-		install -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.cshrc \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.cshrc \
 		    ${DESTDIR}/root/.cshrc; \
-		install -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.klogin \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.klogin \
 		    ${DESTDIR}/root/.klogin; \
-		install -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.login \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.login \
 		    ${DESTDIR}/root/.login; \
-		install -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.profile \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.profile \
 		    ${DESTDIR}/root/.profile; \
 		rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \
 		ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \
 		ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile)
-	cd ${.CURDIR}/mtree; install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	cd ${.CURDIR}/mtree; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
-	cd ${.CURDIR}/namedb; install -c -o ${BINOWN} -g ${BINGRP} -m 644 \
+	cd ${.CURDIR}/namedb; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${NAMEDB} ${DESTDIR}/etc/namedb
-	cd ${.CURDIR}/ppp; install -c -o ${BINOWN} -g ${BINGRP} -m 644 \
+	cd ${.CURDIR}/ppp; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \
 	    ${PPPCNF} ${DESTDIR}/etc/ppp
-	install -c -o ${BINOWN} -g operator -m 664 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
-	install -c -o nobody -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} -c -o nobody -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/db/locate.database
-	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/log/lpd-errs
-	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/log/maillog
-	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/log/lastlog
-	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/log/messages
-	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/log/wtmp
-	install -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/run/utmp
-	install -c -o ${BINOWN} -g ${BINGRP} -m 664 ${.CURDIR}/minfree \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 ${.CURDIR}/minfree \
 	    ${DESTDIR}/var/crash
-	(cd ${.CURDIR}/etc.${MACHINE}; install -c -o ${BINOWN} -g ${BINGRP} \
+	(cd ${.CURDIR}/etc.${MACHINE}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
 	    -m 444 fstab.* ${DESTDIR}/etc)
 	(cd ${.CURDIR}/../usr.sbin/sendmail/src; \
 	    ${MAKE} obj; \
@ -218,10 +218,11 @@ distribution:
 	 cd ../cf/cf; \
 	    ${MAKE} obj; \
 	    ${MAKE} freefall.cf; \
-	    install -o ${BINOWN} -g ${BINGRP} -m 644 obj/freefall.cf \
-	        ${DESTDIR}/etc/sendmail.cf)
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 obj/freefall.cf \
+		${DESTDIR}/etc/sendmail.cf)
 	(cd ${.CURDIR}/..; \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FREEBSD} ${DESTDIR}/)
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FREEBSD} \
+		${DESTDIR}/)
 	(cd ${.CURDIR}/../share/man; ${MAKE} makedb; )

 crunch:
@ -231,25 +232,25 @@ crunch:
 	${MAKE} -f filesystem.mk objs exe

 extract:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    ${.CURDIR}/etc.i386/EXTRACT_bin.sh \
 	    ${RELEASEDIR}/tarballs/bin/EXTRACT.sh
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    ${.CURDIR}/etc.i386/EXTRACT_src.sh \
 	    ${RELEASEDIR}/tarballs/bin/EXTRACT.sh
-	install -c -o ${BINOWN} -g ${BINGRP} -m 555 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
 	    ${.CURDIR}/etc.i386/EXTRACT_secr.sh \
 	    ${RELEASEDIR}/tarballs/bin/EXTRACT.sh

 hcx9-distribution:
-	(cd ${.CURDIR}/etc.tahoe; install -c -o ${BINOWN} -g ${BINGRP} \
+	(cd ${.CURDIR}/etc.tahoe; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
 	    -m 444 ${WCS2} ${DESTDIR}/)

 kcopy-kernels: ${.CURDIR}/../sys/i386/conf/GENERIC
 	(cd ${.CURDIR}/../sys/compile; rm -rf GENERIC)
 	(cd ${.CURDIR}/../sys/i386/conf; config GENERIC)
 	(cd ${.CURDIR}/../sys/compile/GENERIC; ${MAKE} depend; ${MAKE} all; \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 755 kernel \
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 kernel \
 	        ${DESTDIR}/kernel.GENERIC)

 kcopy-floppy:
@ -265,9 +266,9 @@ kcopy-floppy:
 	${MAKEDEVS}
 	(cd ${DESTDIR}/; \
 	    ls ${KC_FILES} | cpio -pdamuv ${MOUNT})
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/etc.i386/kc.profile ${MOUNT}/etc/rc
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    kcopy ${MOUNT}/bin/kcopy
 	(cd ${MOUNT}/; \
 	    for i in ${KC_LINKS}; do \
@ -277,7 +278,7 @@ kcopy-floppy:
 kcopy.flp:
 	(cd ${.CURDIR}; ${MAKE} kcopy-floppy)
 	(cd ${.CURDIR}/../sys/compile/GENERIC; \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 755 kernel ${MOUNT}/)
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 kernel ${MOUNT}/)
 	df -ik ${MOUNT}
 	# XXX umount is returning 1 for some reason :-(
 	-umount /dev/${FLOPPY}
@ -297,16 +298,16 @@ cdins-floppy:
 	mkdir ${MOUNT}/cdrom
 	chown ${BINOWN}.${BINGRP} ${MOUNT}/cdrom
 	chmod 755 ${MOUNT}/cdrom
-	#install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	#${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	#    ${.CURDIR}/etc.i386/cdinst1.profile ${MOUNT}/.profile
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/etc.i386/cdinst1.install ${MOUNT}/install
 	ln ${MOUNT}/install ${MOUNT}/etc/rc

 cdins.flp:
 	(cd ${.CURDIR}; ${MAKE} kcopy-floppy)
 	(cd ${.CURDIR}/../sys/compile/GENERIC; \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 755 kernel ${MOUNT}/)
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 kernel ${MOUNT}/)
 	df -ik ${MOUNT}
 	# XXX umount is returning 1 for some reason :-(
 	-umount /dev/${FLOPPY}
@ -332,12 +333,12 @@ filesyst.flp:
 	    (find ${FILESYSTEM_CPIO}; ls -d ${FILESYSTEM_CPIO_DIRS}) | \
 		cpio -H newc --block-size=16 -oav | \
 		gzip -9 >${MOUNT}/inst1.cpio.gz)
-	#install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	#${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	#    ${.CURDIR}/etc.i386/inst1.profile ${MOUNT}/.profile
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/etc.i386/inst1.install ${MOUNT}/install
 	ln ${MOUNT}/install ${MOUNT}/etc/rc
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    filesystem ${MOUNT}/bin/filesystem
 	(cd ${MOUNT}/; \
 	    for i in ${FILESYSTEM_LINKS}; do \
@ -376,7 +377,7 @@ cpio.flp:
 	# need to install the smaller one in the same location.
 	#
 	mv ${DESTDIR}/usr/share/misc/termcap ${DESTDIR}/usr/share/misc/otermcap
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/termcap.small ${DESTDIR}/usr/share/misc/termcap
 	(cd ${DESTDIR}/; \
 	    (find ${CPIO_CPIO}; ls -d ${CPIO_CPIO_DIRS}) | \
@ -384,11 +385,11 @@ cpio.flp:
 		gzip -9 >${MOUNT}/inst2.cpio.gz)
 	# XXX cpio is done, put everything back in shape for the bindist.
 	mv ${DESTDIR}/usr/share/misc/otermcap ${DESTDIR}/usr/share/misc/termcap
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/etc.i386/cpio.rc ${MOUNT}/rc
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/etc.i386/cpio.install ${MOUNT}/install
-	install -c -o ${BINOWN} -g ${BINGRP} -m 755 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/etc.i386/cpio.magic ${MOUNT}/magic
 	df -ik ${MOUNT}
 	# XXX umount is returning 1 for some reason :-(
--- a/gnu/include/Makefile
+++ b/gnu/include/Makefile
@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.19 1994/11/01 09:19:50 pst Exp $
+#	$Id: Makefile,v 1.1 1994/11/08 00:47:02 ache Exp $
 #
 all depend lint tags:

@ -9,7 +9,7 @@ beforeinstall:
 	@${ECHO} installing ${FILES}
 	@-for i in ${FILES}; do \
 		cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-		    install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		    ${DESTDIR}/usr/include/$$i; \
 	done

--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@ -1,5 +1,5 @@
 # Makefile for libdialog
-# $Id: Makefile,v 1.11 1995/05/03 18:53:19 ache Exp $
+# $Id: Makefile,v 1.12 1995/05/04 09:45:29 ache Exp $

 LIB=    dialog
 SHLIB_MAJOR= 3
@ -15,7 +15,7 @@ DPADD+= ${LIBNCURSES} ${LIBMYTINFO}

 beforeinstall:
 	-cd ${.CURDIR}; cmp -s dialog.h ${DESTDIR}/usr/include/dialog.h || \
-	      install -c -o ${BINOWN} -g ${BINGRP} -m 444 dialog.h \
+	      ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 dialog.h \
 	      ${DESTDIR}/usr/include

 .include <bsd.lib.mk>
--- a/gnu/lib/libg++/Makefile
+++ b/gnu/lib/libg++/Makefile
@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.9 1995/05/08 16:10:34 ache Exp $
+# $Id: Makefile,v 1.10 1995/07/05 15:04:47 dfr Exp $
 #
 SRCS=	bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c \
 	bitinvert.c bitlcomp.c bitset1.c bitxor.c cleanup.c except.c \
@ -37,7 +37,7 @@ beforeinstall:
 	cd ${.CURDIR}/include; \
 	for i in *.h; do \
 		cmp -s $$i ${DESTDIR}/usr/include/g++/$$i || \
-			install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+			${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 			${DESTDIR}/usr/include/g++/$$i; \
 	done

--- a/gnu/lib/libreadline/Makefile
+++ b/gnu/lib/libreadline/Makefile
@ -1,4 +1,4 @@
-#       $Id: Makefile,v 1.19 1995/02/15 20:59:13 ache Exp $
+#       $Id: Makefile,v 1.20 1995/05/08 08:43:06 ache Exp $


 CFLAGS+= -I${.CURDIR} -DVOID_SIGHANDLER -DHAVE_CONFIG_H
@ -20,7 +20,7 @@ beforeinstall:
 	cd ${.CURDIR}; \
 	for m in ${HEADERS} ; do \
 	  cmp -s $$m ${DESTDIR}/usr/include/readline/$$m || \
-	  install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	  ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 		$$m ${DESTDIR}/usr/include/readline ; \
 	done

--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@ -1,4 +1,4 @@
-# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.13 1995/03/06 05:51:32 nate Exp $
+# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.14 1995/03/12 23:21:29 ache Exp $


 LIB=	gnuregex
@ -10,7 +10,7 @@ SUBDIR+= doc

 beforeinstall:
 	cmp -s ${.CURDIR}/regex.h ${DESTDIR}/usr/include/gnuregex.h || \
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${.CURDIR}/regex.h ${DESTDIR}/usr/include/gnuregex.h

 .include <bsd.lib.mk>
--- a/include/Makefile
+++ b/include/Makefile
@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/4/94
-#	$Id: Makefile,v 1.27 1995/07/13 10:04:11 rgrimes Exp $
+#	$Id: Makefile,v 1.28 1995/08/05 20:24:32 wollman Exp $
 #
 # Doing a make install builds /usr/include
 #
@ -43,7 +43,7 @@ beforeinstall: ${SHARED}
 	@cd ${.CURDIR}; \
 	for i in ${FILES}; do \
 		cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-		    install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		    ${DESTDIR}/usr/include/$$i; \
 	done
 .if exists (${.CURDIR}/../sys/conf/newvers.sh)
@ -72,7 +72,7 @@ beforeinstall: ${SHARED}
 		chmod 755 ${DESTDIR}/usr/include/$$i; \
 		(cd ${.CURDIR}/$$i; for j in *.[ih]; do \
 			cmp -s $$j ${DESTDIR}/usr/include/$$i/$$j || \
-			    install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
+			    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 $$j \
 			    ${DESTDIR}/usr/include/$$i/$$j; \
 		done); \
 	done
--- a/include/rpcsvc/Makefile
+++ b/include/rpcsvc/Makefile
@ -1,5 +1,5 @@
 #	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
-#	$Id: Makefile,v 1.4 1995/06/29 19:43:00 wollman Exp $
+#	$Id: Makefile,v 1.5 1995/06/29 19:45:46 wollman Exp $

 .SUFFIXES: .x

@ -22,13 +22,13 @@ install: all
 	@${ECHO} "Installing RPC service header and definition files"
 .for i in $(EVERYTHING)
 	@cd ${.CURDIR}; cmp -s $i $(RPCDIR)/$i || \
-		(install -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \
+		(${INSTALL} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \
 			$i ${RPCDIR}; \
 			$(ECHO) $i)
 .endfor
 .for i in $(HDRS)
 	@cmp -s $i $(RPCDIR)/$i || \
-		(install -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \
+		(${INSTALL} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \
 			$i ${RPCDIR}; \
 			$(ECHO) $i)
 .endfor
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-#	$Id: Makefile,v 1.15 1995/03/30 06:40:31 phk Exp $
+#	$Id: Makefile,v 1.16 1995/06/30 15:30:35 wollman Exp $

 CFLAGS+=	-DLIBC_SCCS -DDYNAMIC
 OBJS=		crt0.o gcrt0.o c++rt0.o
@ -32,13 +32,14 @@ gcrt0.o: crt0.o

 beforeinstall:
 	cmp -s ${.CURDIR}/dlfcn.h ${DESTDIR}/usr/include/dlfcn.h || \
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${.CURDIR}/dlfcn.h ${DESTDIR}/usr/include

 realinstall:
 .for i in ${OBJS}
 	cmp -s $i ${DESTDIR}/usr/lib/$i || \
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $i ${DESTDIR}/usr/lib
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+		$i ${DESTDIR}/usr/lib
 .endfor

 depend:	.depend
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@ -53,7 +53,7 @@ libkern.${MACHINE}:: ${KMSRCS}
 .endif

 #beforeinstall: tags
-#	install -c -o bin -g bin -m 444 tags /var/db/libc.tags
+#	${INSTALL} -c -o bin -g bin -m 444 tags /var/db/libc.tags

 tags: ${SRCS}
 	ctags ${.ALLSRC:M*.c}
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $

 LIB=	com_err
 SRCS=	com_err.c error_message.c et_name.c init_et.c
@ -9,7 +9,7 @@ SUBDIR=	doc

 beforeinstall:
 	-cd ${.CURDIR}; cmp -s com_err.h ${DESTDIR}/usr/include/com_err.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 com_err.h \
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 com_err.h \
 	    ${DESTDIR}/usr/include

 .include <bsd.lib.mk>
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/2/94
-#	$Id: Makefile,v 1.4 1994/10/12 01:57:56 ache Exp $
+#	$Id: Makefile,v 1.5 1995/03/19 21:47:42 nate Exp $

 CFLAGS+=#-DTFILE=\"/dev/ttyp0\"
 CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR}
@ -16,7 +16,7 @@ MAN3=	curses.3

 beforeinstall:
 	-cd ${.CURDIR}; cmp -s curses.h ${DESTDIR}/usr/include/curses.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 curses.h \
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 curses.h \
 	    ${DESTDIR}/usr/include

 .include <bsd.lib.mk>
--- a/lib/libforms/Makefile
+++ b/lib/libforms/Makefile
@ -11,7 +11,7 @@ CLEANFILES+= lex.c parser.c y.tab.h

 beforeinstall:
 	@(cd ${.CURDIR}; cmp -s forms.h ${DESTDIR}/usr/include/forms.h || \
-	   install -c -o ${BINOWN} -g ${BINGRP} -m 444 forms.h \
+	   ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 forms.h \
 	   ${DESTDIR}/usr/include/forms.h;)

 .include <bsd.lib.mk>
--- a/lib/libmd/Makefile
+++ b/lib/libmd/Makefile
@ -88,13 +88,13 @@ beforedepend:	md2hl.c md4hl.c md5hl.c

 beforeinstall:
 	-cd ${.CURDIR}; cmp -s md2.h ${DESTDIR}/usr/include/md2.h || \
-	  install -c -o ${BINOWN} -g ${BINGRP} -m 444 md2.h \
+	  ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 md2.h \
 	  ${DESTDIR}/usr/include
 	-cd ${.CURDIR}; cmp -s md4.h ${DESTDIR}/usr/include/md4.h || \
-	  install -c -o ${BINOWN} -g ${BINGRP} -m 444 md4.h \
+	  ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 md4.h \
 	  ${DESTDIR}/usr/include
 	-cd ${.CURDIR}; cmp -s md5.h ${DESTDIR}/usr/include/md5.h || \
-	  install -c -o ${BINOWN} -g ${BINGRP} -m 444 md5.h \
+	  ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 md5.h \
 	  ${DESTDIR}/usr/include

 .include <bsd.lib.mk>
--- a/lib/libscsi/Makefile
+++ b/lib/libscsi/Makefile
@ -12,7 +12,7 @@ MAN3=	scsi.3

 beforeinstall:
 	-cd ${.CURDIR}; cmp -s scsi.h ${DESTDIR}/usr/include/scsi.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 scsi.h \
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 scsi.h \
 	    ${DESTDIR}/usr/include


--- a/lib/libskey/Makefile
+++ b/lib/libskey/Makefile
@ -9,7 +9,7 @@ CFLAGS+=-DPERMIT_CONSOLE -I${.CURDIR}

 beforeinstall:
 	-cd ${.CURDIR}; cmp -s skey.h ${DESTDIR}/usr/include/skey.h || \
-	  install -c -o ${BINOWN} -g ${BINGRP} -m 444 skey.h \
+	  ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 skey.h \
 	  ${DESTDIR}/usr/include

 .include <bsd.lib.mk>
--- a/lib/libss/Makefile
+++ b/lib/libss/Makefile
@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1995/03/18 08:34:42 rgrimes Exp $
+#	$Id: Makefile,v 1.8 1995/05/30 05:47:36 rgrimes Exp $

 LIB=	ss
 SRCS=	ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \
@ -25,16 +25,16 @@ std_rqs.c:		${.CURDIR}/std_rqs.ct

 beforeinstall:
 	-cd ${.CURDIR}; cmp -s ss.h ${DESTDIR}/usr/include/ss/ss.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 ss.h \
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ss.h \
 	    ${DESTDIR}/usr/include/ss
 	-cd ${.CURDIR}; cmp -s copyright.h \
 	    ${DESTDIR}/usr/include/ss/mit-sipb-copyright.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 copyright.h \
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 copyright.h \
 	    ${DESTDIR}/usr/include/ss/mit-sipb-copyright.h
 	-cd ${.OBJDIR}; \
 	    if [ -f ss_err.h ]; then \
 		cmp -s ss_err.h ${DESTDIR}/usr/include/ss/ss_err.h || \
-		install -c -o ${BINOWN} -g ${BINGRP} -m 444 ss_err.h \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ss_err.h \
 		${DESTDIR}/usr/include/ss; \
 	    else \
 		true; \
--- a/lib/libtermcap/Makefile
+++ b/lib/libtermcap/Makefile
@ -21,7 +21,7 @@ LINKS+=	${LIBDIR}/libtermcap_p.a ${LIBDIR}/libtermlib_p.a

 beforeinstall:
 	-cd ${.CURDIR}; cmp -s termcap.h ${DESTDIR}/usr/include/termcap.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 termcap.h \
+	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 termcap.h \
 	    ${DESTDIR}/usr/include

 .include <bsd.lib.mk>
--- a/libexec/rbootd/Makefile
+++ b/libexec/rbootd/Makefile
@ -6,7 +6,7 @@ MAN8=	rbootd.8

 # XXX BROKEN:	afterinstall:
 XXXafterinstall:
-	(cd ${.CURDIR}/bootdir && install -c -o ${BINOWN} -g ${BINGRP} \
+	(cd ${.CURDIR}/bootdir && ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
 	    -m 444 * ${DESTDIR}/usr/mdec/)

 .include <bsd.prog.mk>
--- a/usr.sbin/pkg_manage/Makefile
+++ b/usr.sbin/pkg_manage/Makefile
@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1995/05/27 20:05:35 jkh Exp $
+# $Id: Makefile,v 1.6 1995/05/30 03:50:08 rgrimes Exp $

 PROG=   pkg_manage
 SRCS=   pkg_main.c pkg_manage.c pkg_ui.c version.c
@ -20,7 +20,7 @@ afterinstall:
 	@cd ${.CURDIR}; \
 	for m in ${HELPS} ; do \
 	  cmp -s $$m ${DESTDIR}${HELPDIR}/$$m || \
-	  install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	  ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
 		$$m ${DESTDIR}${HELPDIR} ; \
 	done

--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@ -32,7 +32,7 @@ BINGRP=	kmem
 BINMODE=6555

 beforeinstall:
-#	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+#	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 #	    ${DESTDIR}/etc/sendmail.fc
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/log/sendmail.st
--- a/usr.sbin/sendmail/src/Makefile.FreeBSD
+++ b/usr.sbin/sendmail/src/Makefile.FreeBSD
@ -40,7 +40,7 @@ BINGRP=	kmem
 BINMODE=6555

 beforeinstall:
-#	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+#	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 #	    ${DESTDIR}/etc/sendmail.fc
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
 	    ${DESTDIR}/var/log/sendmail.st