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.

10 files changed, 20 insertions, 19 deletions

diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index 43383cc..2a2f7dc 100644
--- 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
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 122e158..a5ac9e5 100644
--- 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}
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index d702d36..c295a3a 100644
--- 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>
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 26e9a14..902e59d 100644
--- 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>
diff --git a/lib/libforms/Makefile b/lib/libforms/Makefile
index 55e06c1..36b0c4f 100644
--- 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>
diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile
index d543dd5..ab70c11 100644
--- 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>
diff --git a/lib/libscsi/Makefile b/lib/libscsi/Makefile
index b0b7ac1..844f8aa 100644
--- 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
 
 
diff --git a/lib/libskey/Makefile b/lib/libskey/Makefile
index 0630c56..bdc3999 100644
--- 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>
diff --git a/lib/libss/Makefile b/lib/libss/Makefile
index e1026ef..b6a5e70 100644
--- 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; \
diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile
index cab35af..5445de0 100644
--- 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>