COPY -> INSTALL_COPY and STRIP -> INSTALL_STRIP changes.

For some reason the previous commit did not grab these.

9 files changed, 41 insertions, 38 deletions

diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index 11c2f4fd33b..8eb51e11062 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.README,v 1.14 1997/04/18 03:49:48 millert Exp $
+#	$OpenBSD: bsd.README,v 1.15 1997/04/27 21:38:25 millert Exp $
 #	$NetBSD: bsd.README,v 1.17 1996/04/13 02:08:08 thorpej Exp $
 #	@(#)bsd.README	5.1 (Berkeley) 5/11/90
 
@@ -162,16 +162,19 @@ NLSOWN		National Language Support files owner. [bin]
 
 NLSMODE		National Language Support files mode. [${NONBINMODE}]
 
-STRIP		The flag passed to the install program to cause the binary
+INSTALL_STRIP	The flag passed to the install program to cause the binary
 		to be stripped.  This is to be used when building your
 		own install script so that the entire system can be made
-		stripped/not-stripped using a single knob. [-s]
-
-COPY		The flag passed to the install program to cause the binary
-		to be copied rather than moved.  This is to be used when
-		building our own install script so that the entire system
-		can either be installed with copies, or with moves using
-		a single knob. [-c]
+		stripped/not-stripped using a single knob.  Note that
+		INSTALL_STRIP is not set if ${DEBUG} is defined. [-s]
+
+INSTALL_COPY	The old usage of this flag is obsolescent since install(1)
+		now copies by default.  However, it can also be used to
+		specify that a file not be copied unless it is different
+		(via the -p option).  See install(1) for details.  This
+		is to be used when building our own install script so
+		that the entire system can either be installed with copies,
+		or copy-if-different using a single knob. [-c]
 
 Additionally, the following variables may be set by bsd.own.mk or in a
 make configuration file to modify the behaviour of the system build
diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk
index c65c01b1f40..9cb19e3085b 100644
--- a/share/mk/bsd.doc.mk
+++ b/share/mk/bsd.doc.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.doc.mk,v 1.5 1996/12/08 14:42:27 downsj Exp $
+#	$OpenBSD: bsd.doc.mk,v 1.6 1997/04/27 21:38:26 millert Exp $
 #	$NetBSD: bsd.doc.mk,v 1.20 1994/07/26 19:42:37 mycroft Exp $
 #	@(#)bsd.doc.mk	8.1 (Berkeley) 8/14/93
 
@@ -43,7 +43,7 @@ clean cleandir:
 
 FILES?=	${SRCS}
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    Makefile ${FILES} ${EXTRA} ${DESTDIR}${BINDIR}/${DIR}
 
 spell: ${SRCS}
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 71e35bb67d0..ec5bd7864c2 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.lib.mk,v 1.12 1997/02/06 10:49:17 niklas Exp $
+#	$OpenBSD: bsd.lib.mk,v 1.13 1997/04/27 21:38:28 millert Exp $
 #	$NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $
 #	@(#)bsd.lib.mk	5.26 (Berkeley) 5/2/91
 
@@ -184,36 +184,36 @@ beforeinstall:
 
 realinstall:
 #	ranlib lib${LIB}.a
-	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 lib${LIB}.a \
+	${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 lib${LIB}.a \
 	    ${DESTDIR}${LIBDIR}
-.if (${COPY} != "-p")
+.if (${INSTALL_COPY} != "-p")
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .endif
 	chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}.a
 .if !defined(NOPROFILE)
 #	ranlib lib${LIB}_p.a
-	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
+	${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
 	    lib${LIB}_p.a ${DESTDIR}${LIBDIR}
-.if (${COPY} != "-p")
+.if (${INSTALL_COPY} != "-p")
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
 .endif
 	chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_p.a
 .endif
 .if !defined(NOPIC) && (${MACHINE_ARCH} != "mips") 
 #	ranlib lib${LIB}_pic.a
-	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
+	${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m 600 \
 	    lib${LIB}_pic.a ${DESTDIR}${LIBDIR}
-.if (${COPY} != "-p")
+.if (${INSTALL_COPY} != "-p")
 	${RANLIB} -t ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .endif
 	chmod ${LIBMODE} ${DESTDIR}${LIBDIR}/lib${LIB}_pic.a
 .endif
 .if !defined(NOPIC) && defined(SHLIB_MAJOR) && defined(SHLIB_MINOR)
-	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} ${DESTDIR}${LIBDIR}
 .endif
 .if !defined(NOLINT)
-	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    llib-l${LIB}.ln ${DESTDIR}${LINTLIBDIR}
 .endif
 .if defined(LINKS) && !empty(LINKS)
diff --git a/share/mk/bsd.lkm.mk b/share/mk/bsd.lkm.mk
index a96af27d31e..90b65f5cd1d 100644
--- a/share/mk/bsd.lkm.mk
+++ b/share/mk/bsd.lkm.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.lkm.mk,v 1.11 1996/12/08 14:42:29 downsj Exp $
+#	$OpenBSD: bsd.lkm.mk,v 1.12 1997/04/27 21:38:29 millert Exp $
 
 .if exists(${.CURDIR}/../Makefile.inc)
 .include "${.CURDIR}/../Makefile.inc"
@@ -63,10 +63,10 @@ afterinstall:
 .if !target(realinstall)
 realinstall:
 .if defined(LKM)
-	${INSTALL} ${COPY} -o ${LKMOWN} -g ${LKMGRP} -m ${LKMMODE} \
+	${INSTALL} ${INSTALL_COPY} -o ${LKMOWN} -g ${LKMGRP} -m ${LKMMODE} \
 	    ${COMBINED} ${DESTDIR}${LKMDIR}/${LKM}.o
 .if exists(${.CURDIR}/${POSTINSTALL})
-	${INSTALL} ${COPY} -o ${LKMOWN} -g ${LKMGRP} -m 555 \
+	${INSTALL} ${INSTALL_COPY} -o ${LKMOWN} -g ${LKMGRP} -m 555 \
 	    ${.CURDIR}/${POSTINSTALL} ${DESTDIR}${LKMDIR}
 .endif
 .endif
diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk
index 583ea6b2366..c0db09b2b37 100644
--- a/share/mk/bsd.man.mk
+++ b/share/mk/bsd.man.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.man.mk,v 1.14 1996/12/08 14:42:30 downsj Exp $
+#	$OpenBSD: bsd.man.mk,v 1.15 1997/04/27 21:38:30 millert Exp $
 #	$NetBSD: bsd.man.mk,v 1.23 1996/02/10 07:49:33 jtc Exp $
 #	@(#)bsd.man.mk	5.2 (Berkeley) 5/11/90
 
@@ -30,7 +30,7 @@ TBL?=		tbl
 MANALL=	${MAN:S/.1$/.cat1/g:S/.2$/.cat2/g:S/.3$/.cat3/g:S/.4$/.cat4/g:S/.5$/.cat5/g:S/.6$/.cat6/g:S/.7$/.cat7/g:S/.8$/.cat8/g:S/.9$/.cat9/g:S/.1tbl$/.cat1/g:S/.2tbl$/.cat2/g:S/.3tbl$/.cat3/g:S/.4tbl$/.cat4/g:S/.5tbl$/.cat5/g:S/.6tbl$/.cat6/g:S/.7tbl$/.cat7/g:S/.8tbl$/.cat8/g:S/.9tbl$/.cat9/g}
 .endif
 
-MINSTALL=	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+MINSTALL=	${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
 .if defined(MANZ)
 # chown and chmod are done afterward automatically
 MCOMPRESS=	gzip -cf
diff --git a/share/mk/bsd.nls.mk b/share/mk/bsd.nls.mk
index 8c0c18d2f50..d30f0833811 100644
--- a/share/mk/bsd.nls.mk
+++ b/share/mk/bsd.nls.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.nls.mk,v 1.4 1996/12/08 14:42:31 downsj Exp $
+#	$OpenBSD: bsd.nls.mk,v 1.5 1997/04/27 21:38:31 millert Exp $
 #	$NetBSD: bsd.nls.mk,v 1.2 1995/04/27 18:05:38 jtc Exp $
 
 .if !target(.MAIN)
@@ -33,7 +33,7 @@ nlsinstall:
 		NLSLANG=`basename $$msg .cat`; \
 		dir=${DESTDIR}${NLSDIR}/$${NLSLANG}; \
 		${INSTALL} -d $$dir; \
-		${INSTALL} ${COPY} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} $$msg $$dir/${NLSNAME}.cat; \
+		${INSTALL} ${INSTALL_COPY} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} $$msg $$dir/${NLSNAME}.cat; \
 	done
 .endif
 
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 24a9d7d68c9..11d33eb2a3a 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.own.mk,v 1.16 1997/04/20 11:43:47 niklas Exp $
+#	$OpenBSD: bsd.own.mk,v 1.17 1997/04/27 21:38:32 millert Exp $
 #	$NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $
 
 # Host-specific overrides
@@ -56,9 +56,9 @@ NLSGRP?=	bin
 NLSOWN?=	root
 NLSMODE?=	${NONBINMODE}
 
-COPY?=		-c
+INSTALL_COPY?=	-c
 .ifndef DEBUG
-STRIP?=		-s
+INSTALL_STRIP?=	-s
 .endif
 
 # This may be changed for _single filesystem_ configurations (such as
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index c8c77394abf..d201c1de99a 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
-#	$OpenBSD: bsd.port.mk,v 1.11 1997/04/19 19:34:29 millert Exp $
+#	$OpenBSD: bsd.port.mk,v 1.12 1997/04/27 21:38:33 millert Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -420,13 +420,13 @@ MAKE_ENV+=	EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>"
 
 # A few aliases for *-install targets
 INSTALL_PROGRAM= \
-	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+	${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_SCRIPT= \
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 INSTALL_DATA= \
-	${INSTALL} ${COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE}
+	${INSTALL} ${INSTALL_COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE}
 INSTALL_MAN= \
-	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
+	${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
 
 # The user can override the NO_PACKAGE by specifying this from
 # the make command line
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 821b1a696e0..0a15096d826 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.prog.mk,v 1.12 1997/03/26 00:34:54 deraadt Exp $
+#	$OpenBSD: bsd.prog.mk,v 1.13 1997/04/27 21:38:34 millert Exp $
 #	$NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
 #	@(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
 
@@ -114,8 +114,8 @@ afterinstall:
 .if !target(realinstall)
 realinstall:
 .if defined(PROG)
-	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${PROG} ${DESTDIR}${BINDIR}
+	${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} \
+	    -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}
 .endif
 .if defined(HIDEGAME)
 	(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG})