COPY -> INSTALL_COPY and STRIP -> INSTALL_STRIP

This fixes namespace problems where STRIP is sometimes used as
the name of the strip(1) to use and other times used as
the flag to send install(1) when stripping (or not).
COPY doesn't have this problem (yet) but was poorly named.

27 files changed, 53 insertions, 53 deletions

diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile
index b9844de3215..b646ae6c0b3 100644
--- a/lib/csu/alpha/Makefile
+++ b/lib/csu/alpha/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1996/11/13 21:23:13 niklas Exp $
+#	$OpenBSD: Makefile,v 1.5 1997/04/27 20:55:59 millert Exp $
 #	$NetBSD: Makefile,v 1.6 1996/10/18 05:27:38 thorpej Exp $
 
 .include <bsd.own.mk>			# for ELF_TOOLCHAIN definition
@@ -41,7 +41,7 @@ crtend.o: crtend.c
 	@rm -f ${.TARGET}.o
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 	    ${DESTDIR}/usr/lib
 
 .include <bsd.prog.mk>
diff --git a/lib/csu/c++/Makefile b/lib/csu/c++/Makefile
index 8578af4a618..4d87823269b 100644
--- a/lib/csu/c++/Makefile
+++ b/lib/csu/c++/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/12/08 15:22:18 downsj Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/04/27 20:56:00 millert Exp $
 
 CFLAGS+=	-DLIBC_SCCS
 .if !defined(NOPIC)
@@ -14,7 +14,7 @@ c++rt0.o: c++rt0.c
 	@mv a.out ${.TARGET}
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 	    ${DESTDIR}/usr/lib
 
 .include <bsd.prog.mk>
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index 76e6e1aa75b..77b673146d0 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.2 1996/12/08 15:22:19 downsj Exp $
+#	$Id: Makefile,v 1.3 1997/04/27 20:56:00 millert Exp $
 
 CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
 OBJS=		crt0.o gcrt0.o scrt0.o
@@ -26,7 +26,7 @@ scrt0.o: ${SRCS}
 	@rm -f ${.TARGET}.o
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 	    ${DESTDIR}/usr/lib
 
 .if make(depend)
diff --git a/lib/csu/m68k/Makefile b/lib/csu/m68k/Makefile
index 87426c39ba5..326da743a5c 100644
--- a/lib/csu/m68k/Makefile
+++ b/lib/csu/m68k/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.2 1996/12/08 15:22:20 downsj Exp $
+#	$Id: Makefile,v 1.3 1997/04/27 20:56:01 millert Exp $
 
 CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
 OBJS=		crt0.o gcrt0.o scrt0.o
@@ -26,7 +26,7 @@ scrt0.o: ${SRCS}
 	@rm -f ${.TARGET}.o
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 	    ${DESTDIR}/usr/lib
 
 .if make(depend)
diff --git a/lib/csu/mips/Makefile b/lib/csu/mips/Makefile
index 095e3a84a42..58e05c5546e 100644
--- a/lib/csu/mips/Makefile
+++ b/lib/csu/mips/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/1/93
-#	$Id: Makefile,v 1.7 1996/12/08 15:22:21 downsj Exp $
+#	$Id: Makefile,v 1.8 1997/04/27 20:56:02 millert Exp $
 
 CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}
 OBJS=		crt0.o gcrt0.o scrt0.o crtn.o
@@ -28,7 +28,7 @@ scrt0.o: ${SRCS} ${DEPS}
 	@rm -f ${.TARGET}.o
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 	    ${DESTDIR}/usr/lib
 
 depend lint tags:
diff --git a/lib/csu/mvme88k/Makefile b/lib/csu/mvme88k/Makefile
index 50b19edaacb..1132db29d87 100644
--- a/lib/csu/mvme88k/Makefile
+++ b/lib/csu/mvme88k/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.1 1997/03/25 17:06:44 rahnds Exp $
+#	$Id: Makefile,v 1.2 1997/04/27 20:56:03 millert Exp $
 
 CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
 OBJS=		crt0.o gcrt0.o scrt0.o
@@ -30,7 +30,7 @@ scrt0.o: ${SRCS}
 	@rm -f ${.TARGET}.o
 
 install:
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 	    ${DESTDIR}/usr/lib
 
 .if make(depend)
diff --git a/lib/csu/ns32k/Makefile b/lib/csu/ns32k/Makefile
index 61db62a9e3c..cebe2b951ce 100644
--- a/lib/csu/ns32k/Makefile
+++ b/lib/csu/ns32k/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.2 1996/12/08 15:22:22 downsj Exp $
+#	$Id: Makefile,v 1.3 1997/04/27 20:56:03 millert Exp $
 
 CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
 OBJS=		crt0.o gcrt0.o scrt0.o
@@ -26,7 +26,7 @@ scrt0.o: ${SRCS}
 	@rm -f ${.TARGET}.o
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 	    ${DESTDIR}/usr/lib
 
 .if make(depend)
diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile
index fd37c1d03d8..8be332ec02f 100644
--- a/lib/csu/powerpc/Makefile
+++ b/lib/csu/powerpc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/1/93
-#	$Id: Makefile,v 1.1 1996/12/21 20:53:48 rahnds Exp $
+#	$Id: Makefile,v 1.2 1997/04/27 20:56:04 millert Exp $
 
 CFLAGS=		-DLIBC_SCCS
 OBJS=		crt0.o gcrt0.o crtbegin.o crtend.o
@@ -30,7 +30,7 @@ crtend.o: crtend.s
 	@rm -f ${.TARGET}.o
 
 install:
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 		${DESTDIR}/usr/lib
 
 depend lint tags:
diff --git a/lib/csu/sparc/Makefile b/lib/csu/sparc/Makefile
index 61db62a9e3c..f6490a4d6cc 100644
--- a/lib/csu/sparc/Makefile
+++ b/lib/csu/sparc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.5 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.2 1996/12/08 15:22:22 downsj Exp $
+#	$Id: Makefile,v 1.3 1997/04/27 20:56:05 millert Exp $
 
 CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
 OBJS=		crt0.o gcrt0.o scrt0.o
@@ -26,7 +26,7 @@ scrt0.o: ${SRCS}
 	@rm -f ${.TARGET}.o
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 	    ${DESTDIR}/usr/lib
 
 .if make(depend)
diff --git a/lib/csu/vax/Makefile b/lib/csu/vax/Makefile
index d5794c46299..1922df9d7e6 100644
--- a/lib/csu/vax/Makefile
+++ b/lib/csu/vax/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 5/22/91
-#	$Id: Makefile,v 1.2 1996/12/08 15:22:23 downsj Exp $
+#	$Id: Makefile,v 1.3 1997/04/27 20:56:06 millert Exp $
 
 CFLAGS+=	-DLIBC_SCCS -I${.CURDIR}/..
 OBJS=		crt0.o gcrt0.o scrt0.o
@@ -23,7 +23,7 @@ scrt0.o: crt0.c
 	mv a.out ${.TARGET}
 
 install:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \
 	    ${DESTDIR}/usr/lib
 
 depend lint tags:
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 9696cdb9f23..0896f666f75 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 1997/04/19 21:26:17 millert Exp $
+#	$OpenBSD: Makefile,v 1.13 1997/04/27 20:56:07 millert Exp $
 #
 # All library objects contain sccsid strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -101,7 +101,7 @@ tags: ${SRCS}
 	    >> tags; sort -o tags tags
 
 beforeinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 tags \
+	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 tags \
 		${DESTDIR}/var/db/libc.tags
 
 .include <bsd.lib.mk>
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index 2625f59a631..7376055a47b 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/12/08 15:22:25 downsj Exp $
+#	$OpenBSD: Makefile,v 1.3 1997/04/27 20:56:07 millert Exp $
 
 LIB=	com_err
 SRCS=	com_err.c error_message.c et_name.c init_et.c
@@ -8,7 +8,7 @@ MAN=	com_err.3
 includes:
 	-cd ${.CURDIR}; cmp -s com_err.h ${DESTDIR}/usr/include/com_err.h > \
 	    /dev/null 2>&1 || \
-	    ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 com_err.h \
+	    ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 com_err.h \
 	    ${DESTDIR}/usr/include/com_err.h
 
 .include <bsd.lib.mk>
diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
index 08f958844ec..0608229e6f6 100644
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1996/12/08 15:22:25 downsj Exp $
+#	$OpenBSD: Makefile,v 1.5 1997/04/27 20:56:08 millert Exp $
 #	$NetBSD: Makefile,v 1.15 1995/09/07 07:17:53 jtc Exp $
 
 LIB=	compat
@@ -53,7 +53,7 @@ MAN+=	regexp.3
 includes:
 	@cd ${.CURDIR}; for i in $(HDRS); do \
 	    j="cmp -s $$i ${DESTDIR}/usr/include/`basename $$i` || \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		${DESTDIR}/usr/include"; \
 	    echo $$j; \
 	    eval "$$j"; \
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 5f90a4288b6..4fa8bbb35f9 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 1997/02/27 21:45:53 tholo Exp $
+#	$OpenBSD: Makefile,v 1.14 1997/04/27 20:56:09 millert Exp $
 
 LIB=    curses
 SRCS=	hardscroll.c lib_acs.c lib_delch.c lib_insstr.c lib_options.c \
@@ -30,10 +30,10 @@ beforedepend: keys.tries
 includes:
 	@cd ${.CURDIR}; for i in unctrl.h; do \
 	  cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-	  ${INSTALL} ${COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
+	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
 	  ${DESTDIR}/usr/include; done
 	@cd ${.CURDIR}; cmp -s curses.h ${DESTDIR}/usr/include/curses.h || \
-	  ${INSTALL} ${COPY} -m 444 -o $(BINOWN) -g $(BINGRP) curses.h \
+	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) curses.h \
 	  ${DESTDIR}/usr/include
 
 keys.tries: ${.CURDIR}/keys.list ${.CURDIR}/MKkeys.awk
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
index 18ba3406249..6880d1ed6f9 100644
--- a/lib/libedit/Makefile
+++ b/lib/libedit/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1997/01/16 05:18:27 millert Exp $
+#	$OpenBSD: Makefile,v 1.5 1997/04/27 20:56:10 millert Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/4/93
 
 LIB=	edit
@@ -63,7 +63,7 @@ test:	libedit.a test.o
 includes:
 	-cd ${.CURDIR}; cmp -s histedit.h ${DESTDIR}/usr/include/histedit.h > \
 	    /dev/null 2>&1 || \
-	    ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 histedit.h \
+	    ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 histedit.h \
 	    ${DESTDIR}/usr/include
 
 .include <bsd.lib.mk>
diff --git a/lib/libform/Makefile b/lib/libform/Makefile
index 30876a65d53..1568bb10a7b 100644
--- a/lib/libform/Makefile
+++ b/lib/libform/Makefile
@@ -14,7 +14,7 @@ MAN=	form.3 form_field_userptr.3 form_cursor.3 form_field_validation.3 \
 includes:
 	@cd ${.CURDIR}; for i in ${HDRS}; do \
 	  cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-	  ${INSTALL} ${COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
+	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
 	  ${DESTDIR}/usr/include; done
 
 .include <bsd.lib.mk>
diff --git a/lib/libmenu/Makefile b/lib/libmenu/Makefile
index 052e2e64045..dc9882854bb 100644
--- a/lib/libmenu/Makefile
+++ b/lib/libmenu/Makefile
@@ -12,7 +12,7 @@ MAN=	menu.3 menu_driver.3 menu_items.3 menu_opts.3 menu_userptr.3 \
 includes:
 	@cd ${.CURDIR}; for i in ${HDRS}; do \
 	  cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-	  ${INSTALL} ${COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
+	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
 	  ${DESTDIR}/usr/include; done
 
 .include <bsd.lib.mk>
diff --git a/lib/libocurses/Makefile b/lib/libocurses/Makefile
index 0639a5b3584..e748ce0d7a0 100644
--- a/lib/libocurses/Makefile
+++ b/lib/libocurses/Makefile
@@ -14,7 +14,7 @@ MAN=	ocurses.3
 includes:
 	-cd ${.CURDIR}; cmp -s curses.h ${DESTDIR}/usr/include/ocurses.h > \
 	    /dev/null 2>&1 || \
-	    ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 curses.h \
+	    ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 curses.h \
 	    ${DESTDIR}/usr/include/ocurses.h
 
 .if make(install)
diff --git a/lib/libpanel/Makefile b/lib/libpanel/Makefile
index a02e56d3a60..938f750b552 100644
--- a/lib/libpanel/Makefile
+++ b/lib/libpanel/Makefile
@@ -6,7 +6,7 @@ MAN=	panel.3
 includes:
 	@cd ${.CURDIR}; for i in ${HDRS}; do \
 	  cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-	  ${INSTALL} ${COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
+	  ${INSTALL} ${INSTALL_COPY} -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
 	  ${DESTDIR}/usr/include; done
 
 .include <bsd.lib.mk>
diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 027aded7333..f2890b0e584 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 1996/12/08 15:22:30 downsj Exp $
+#	$OpenBSD: Makefile,v 1.8 1997/04/27 20:56:13 millert Exp $
 #	$NetBSD: Makefile,v 1.3 1996/05/10 21:54:24 cgd Exp $
 
 LIB=	pcap
@@ -24,7 +24,7 @@ scanner.c:	scanner.l grammar.c
 includes:
 	@cd ${.CURDIR}; for i in $(HDRS); do \
 	    j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		${DESTDIR}/usr/include"; \
 	    echo $$j; \
 	    eval "$$j"; \
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index 18c2bb6c19c..abca9189a40 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1996/12/08 15:22:31 downsj Exp $
+#	$OpenBSD: Makefile,v 1.5 1997/04/27 20:56:14 millert Exp $
 
 
 RPCSRCS=	bootparam_prot.x klm_prot.x mount.x nfs_prot.x\
@@ -21,13 +21,13 @@ includes:	${HDRS}
 	@echo installing rpc .h and .x files
 	@for i in $(HDRS); do \
 	    cmp -s $$i ${DESTDIR}/usr/include/rpcsvc/$$i || \
-		{ j="${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		{ j="${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		${DESTDIR}/usr/include/rpcsvc"; \
 		echo $$j; $$j; } \
 	done
 	@cd ${.CURDIR}; for i in $(RPCSRCS); do \
 	    cmp -s $(.CURDIR)/$$i ${DESTDIR}/usr/include/rpcsvc/$$i || \
-		{ j="${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		{ j="${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		${DESTDIR}/usr/include/rpcsvc"; \
 		echo $$j; $$j; } \
 	done
diff --git a/lib/libskey/Makefile b/lib/libskey/Makefile
index 87906ee501d..3c6a145a648 100644
--- a/lib/libskey/Makefile
+++ b/lib/libskey/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1996/12/08 15:22:32 downsj Exp $
+# $Id: Makefile,v 1.4 1997/04/27 20:56:15 millert Exp $
 
 LIB=	skey
 SRCS=	skeylogin.c skeysubr.c put.c
@@ -8,7 +8,7 @@ HDRS=	skey.h
 includes:
 	@cd ${.CURDIR}; for i in $(HDRS); do \
 	    j="cmp -s $$i ${DESTDIR}/usr/include/`basename $$i` || \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		${DESTDIR}/usr/include"; \
 	    echo $$j; \
 	    eval "$$j"; \
diff --git a/lib/libss/Makefile b/lib/libss/Makefile
index c6abe2b122a..5eacd41674d 100644
--- a/lib/libss/Makefile
+++ b/lib/libss/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1997/02/26 02:03:39 downsj Exp $
+#	$OpenBSD: Makefile,v 1.6 1997/04/27 20:56:16 millert Exp $
 
 LIB=	ss
 HDRS=	ss.h ${.OBJDIR}/ss_err.h
@@ -24,7 +24,7 @@ includes: ss_err.h
 		${DESTDIR}/usr/include/ss; \
 	cd ${.CURDIR}; for i in $(HDRS); do \
 	    j="cmp -s $$i ${DESTDIR}/usr/include/ss/$$i || \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		${DESTDIR}/usr/include/ss"; \
 	    echo $$j; \
 	    eval "$$j"; \
diff --git a/lib/libtermlib/Makefile b/lib/libtermlib/Makefile
index be04534d522..bf0ba0c5724 100644
--- a/lib/libtermlib/Makefile
+++ b/lib/libtermlib/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.6 1997/01/05 08:22:05 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 1997/04/27 20:56:17 millert Exp $
 #
 # Copyright (c) 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
 # All rights reserved.
@@ -68,7 +68,7 @@ binaries.h:	mkinfo Capabilities
 includes:	${HDRS}
 	@for i in ${HDRS}; do \
 	    cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		${DESTDIR}/usr/include; \
 	done
 
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index a5c450ccf60..d03c964ad1b 100644
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.12 1997/02/16 19:59:17 provos Exp $
+#	$OpenBSD: Makefile,v 1.13 1997/04/27 20:56:18 millert Exp $
 #	$NetBSD: Makefile,v 1.8 1996/05/16 07:03:28 thorpej Exp $
 
 LIB=	util
@@ -38,7 +38,7 @@ MLINKS+=scsi.3 scsi_debug_output.3
 includes:
 	@cd ${.CURDIR}; for i in $(HDRS); do \
 	    j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		${DESTDIR}/usr/include"; \
 	    echo $$j; \
 	    eval "$$j"; \
diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile
index 4bcd27d2535..2da18026bf6 100644
--- a/lib/libwrap/Makefile
+++ b/lib/libwrap/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1997/03/04 08:59:23 downsj Exp $
+#	$OpenBSD: Makefile,v 1.3 1997/04/27 20:56:19 millert Exp $
 
 LIB=	wrap
 SRCS=	hosts_access.c options.c shell_cmd.c rfc931.c eval.c \
@@ -23,7 +23,7 @@ MLINKS+=hosts_access.3 request_set.3
 includes:
 	@cd ${.CURDIR}; for i in $(HDRS); do \
 	    j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
+		${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
 		${DESTDIR}/usr/include"; \
 	    echo $$j; \
 	    eval "$$j"; \
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index c3625c96dc6..b1c0015d298 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/12/08 15:22:35 downsj Exp $
+#	$OpenBSD: Makefile,v 1.4 1997/04/27 20:56:20 millert Exp $
 
 LIB=	z
 HDRS=	zconf.h zlib.h
@@ -10,8 +10,8 @@ NOMAN=	noman
 includes:
 	@cd ${.CURDIR}; for i in $(HDRS); do \
 		j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-		    ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
-		    ${DESTDIR}/usr/include"; \
+		    ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+		    $$i ${DESTDIR}/usr/include"; \
 		echo $$j; \
 		eval "$$j"; \
 	done