From: downsj <downsj@openbsd.org>
Date: Sun, 8 Dec 1996 14:32:16 +0000 (+0000)
Subject: install -> ${INSTALL}, -c -> ${COPY}
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b26ff1d191a3864c1e5ba7033e188e270177a8c2;p=openbsd

install -> ${INSTALL}, -c -> ${COPY}
---

diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 39c98d15ab0..c45bbe9cfb2 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/12/05 06:04:36 millert Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/12/08 14:32:16 downsj Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	calendar
@@ -6,12 +6,12 @@ SRCS=   calendar.c io.c day.c ostern.c paskha.c
 INTER=	de_DE.ISO_8859-1 hr_HR.ISO_8859-2 ru_SU.KOI8-R
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}/usr/share/calendar
 .for lang in ${INTER}
 	@test -d ${DESTDIR}/usr/share/calendar/${lang} || \
 		mkdir ${DESTDIR}/usr/share/calendar/${lang}
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
     		${.CURDIR}/calendars/${lang}/calendar.* \
 		${DESTDIR}/usr/share/calendar/${lang}; 
 .endfor
diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile
index 32c22989017..63093bb3161 100644
--- a/usr.bin/compress/Makefile
+++ b/usr.bin/compress/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:32:19 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:20 downsj Exp $
 #	$NetBSD: Makefile,v 1.6 1995/03/26 09:44:29 glass Exp $
 
 PROG=	compress
@@ -8,7 +8,7 @@ MLINKS= compress.1 uncompress.1
 #MLINKS+=compress.1 zcat.1
 
 #afterinstall:
-#	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+#	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 #	    ${.CURDIR}/zcat.sh ${DESTDIR}/usr/bin/zcat
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/cpp/Makefile b/usr.bin/cpp/Makefile
index c61ba467574..23f5369ad00 100644
--- a/usr.bin/cpp/Makefile
+++ b/usr.bin/cpp/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.4 1996/08/26 21:25:22 niklas Exp $
+#	$OpenBSD: Makefile,v 1.5 1996/12/08 14:32:21 downsj Exp $
 
 NOMAN=
 
 beforeinstall:
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/cpp.sh ${DESTDIR}${BINDIR}/cpp
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/false/Makefile b/usr.bin/false/Makefile
index 02787b71ed8..aa08c801bdf 100644
--- a/usr.bin/false/Makefile
+++ b/usr.bin/false/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:32:49 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:23 downsj Exp $
 
 MAN=	false.1
 
 beforeinstall:
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/false.sh ${DESTDIR}${BINDIR}/false
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 6c603fa08bf..436ed0e148a 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1996/07/27 11:32:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 1996/12/08 14:32:25 downsj Exp $
 
 MAGIC=		/etc/magic
 MAGICOWN=	root
@@ -22,7 +22,7 @@ magic:		$(MAGFILES)
 	cat $(MAGFILES) > $(.TARGET)
 
 afterinstall:
-	install ${COPY} -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) magic \
+	${INSTALL} ${COPY} -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 ce55ec52e6f..33cdfd66b97 100644
--- a/usr.bin/gprof/Makefile
+++ b/usr.bin/gprof/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/10/04 19:16:54 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/12/08 14:32:25 downsj Exp $
 #	$NetBSD: Makefile,v 1.14 1995/04/19 07:24:08 cgd Exp $
 
 .if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "mips")
@@ -11,7 +11,7 @@ CFLAGS+= -D${MACHINE_ARCH}
 .endif
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} ${COPY} -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 626714b74f8..fb374a30c54 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:34:22 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:26 downsj Exp $
 
 PROG=	id
 MAN=	id.1 groups.1 whoami.1
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/groups.sh ${DESTDIR}/usr/bin/groups
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/whoami.sh ${DESTDIR}/usr/bin/whoami
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index a71748b9785..c767ac0c350 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:35:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:27 downsj Exp $
 #
 # By default, flex will be configured to generate 8-bit scanners only if the
 # -8 flag is given.  If you want it to always generate 8-bit scanners, add
@@ -40,7 +40,7 @@ scan.c: scan.l
 scan.o: parse.c
 
 afterinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/FlexLexer.h \
-		${DESTDIR}/usr/include/g++
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${.CURDIR}/FlexLexer.h ${DESTDIR}/usr/include/g++
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 245ce694fd4..3548b283b73 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.7 1996/09/15 16:50:37 michaels Exp $
+#	$OpenBSD: Makefile,v 1.8 1996/12/08 14:32:28 downsj Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.7 1996/09/15 16:50:37 michaels Exp $
+# $Id: Makefile,v 1.8 1996/12/08 14:32:28 downsj Exp $
 
 PROG=	locate
 SRCS=	util.c locate.c
@@ -13,12 +13,13 @@ MLINKS+= locate.updatedb.8 updatedb.8
 
 beforeinstall:
 	-@for i in ${SCRIPTS}; do \
-			install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-    		${.CURDIR}/$$i.sh ${DESTDIR}${LIBEXECDIR}/locate.$$i;\
+			${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m \
+				${BINMODE} ${.CURDIR}/$$i.sh \
+				${DESTDIR}${LIBEXECDIR}/locate.$$i;\
 	done
 
 # only /usr/src/etc/Makefile install files in /etc
-#	${INSTALL} -c -o root -g wheel -m 644 \
+#	${INSTALL} ${COPY} -o root -g wheel -m 644 \
 #		${.CURDIR}/locate.rc ${DESTDIR}/etc
 
 .include "../../Makefile.inc"
diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile
index f671e4e5389..607af6b2509 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/06/26 05:36:08 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/12/08 14:32:28 downsj Exp $
 #	$NetBSD: Makefile,v 1.9 1995/12/18 07:59:12 jonathan Exp $
 
 MAN=	lorder.1
@@ -11,7 +11,7 @@ SCRIPT=	lorder.sh
 .endif
 
 realinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/${SCRIPT} ${DESTDIR}${BINDIR}/lorder
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index a04338e4334..765ebad18f0 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 1996/06/11 12:53:31 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/12/08 14:32:29 downsj Exp $
 #	$NetBSD: Makefile,v 1.8 1996/06/08 19:48:09 christos Exp $
 
 PROG=	mail
@@ -11,9 +11,9 @@ LINKS=	${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
 MLINKS=	mail.1 Mail.1 mail.1 mailx.1
 
 beforeinstall:
-	cd ${.CURDIR}/misc; install -c -o ${BINOWN} -g ${BINGRP} \
+	cd ${.CURDIR}/misc; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} \
 	    -m 444 ${SFILES} ${DESTDIR}/usr/share/misc
-	cd ${.CURDIR}/misc; install -c -o root -g wheel \
+	cd ${.CURDIR}/misc; ${INSTALL} ${COPY} -o root -g wheel \
 	    -m 644 ${EFILES} ${DESTDIR}/etc
 
 .if make(install)
diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile
index 1222ebf8481..b1424ded291 100644
--- a/usr.bin/mkdep/Makefile
+++ b/usr.bin/mkdep/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:37:06 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:30 downsj Exp $
 #	$NetBSD: Makefile,v 1.6 1994/12/23 07:34:55 jtc Exp $
 
 MAN=	mkdep.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/mkdep.gcc.sh ${DESTDIR}/usr/bin/mkdep
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index 38862a312b3..459b2714ea9 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1996/10/14 03:51:05 etheisen Exp $
+#	$OpenBSD: Makefile,v 1.6 1996/12/08 14:32:31 downsj Exp $
 #	@(#)Makefile	5.11 (Berkeley) 6/25/90
 
 PROG=	more
@@ -8,7 +8,7 @@ MLINKS=	more.1 page.1
 LINKS=	${BINDIR}/more ${BINDIR}/page
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/more.help \
-	    ${DESTDIR}/usr/share/misc/more.help
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+		${.CURDIR}/more.help ${DESTDIR}/usr/share/misc/more.help
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/oldrdist/Makefile b/usr.bin/oldrdist/Makefile
index 1ece82a4b5a..dca59a23cec 100644
--- a/usr.bin/oldrdist/Makefile
+++ b/usr.bin/oldrdist/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1996/08/22 20:33:14 millert Exp $
+#	$OpenBSD: Makefile,v 1.5 1996/12/08 14:32:31 downsj Exp $
 
 PROG=	rdist
 CFLAGS+=-I${.CURDIR}
@@ -10,7 +10,7 @@ CLEANFILES=y.tab.h
 MAN=	oldrdist.1
 
 realinstall:
-	install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${PROG} ${DESTDIR}${BINDIR}/oldrdist
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile
index 598c503205b..14fe38373d1 100644
--- a/usr.bin/pagesize/Makefile
+++ b/usr.bin/pagesize/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:37:42 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:32 downsj Exp $
 #	$NetBSD: Makefile,v 1.6 1995/09/05 01:11:10 cgd Exp $
 
 MAN=	pagesize.1
@@ -6,7 +6,7 @@ MAN=	pagesize.1
 SCRIPT=	pagesize.sh
 
 realinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/${SCRIPT} ${DESTDIR}${BINDIR}/pagesize
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 75cd1a951b4..b965e98172f 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:39:12 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:33 downsj Exp $
 #	$NetBSD: Makefile,v 1.6 1994/12/22 12:30:52 cgd Exp $
 
 MAN=	shar.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/shar.sh ${DESTDIR}/usr/bin/shar
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/skey/Makefile b/usr.bin/skey/Makefile
index 6d8e53748d6..5111ca7edcd 100644
--- a/usr.bin/skey/Makefile
+++ b/usr.bin/skey/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1996/11/14 15:04:50 mickey Exp $
+# $OpenBSD: Makefile,v 1.8 1996/12/08 14:32:34 downsj Exp $
 
 PROG=	skey
 MAN=	skey.1 skeyinfo.1 skeyaudit.1 skeyprune.8
@@ -12,8 +12,11 @@ DPADD=	${LIBSKEY}
 LDADD=	-lskey
 
 beforeinstall:
-	install -c -m 755 ${.CURDIR}/skeyaudit.sh ${DESTDIR}${BINDIR}/skeyaudit
-	install -c -m 755 ${.CURDIR}/skeyinfo.sh ${DESTDIR}${BINDIR}/skeyinfo
-	install -c -m 755 ${.CURDIR}/skeyprune.pl ${DESTDIR}${BINDIR}/skeyprune
+	${INSTALL} ${COPY} -m 755 ${.CURDIR}/skeyaudit.sh \
+		${DESTDIR}${BINDIR}/skeyaudit
+	${INSTALL} ${COPY} -m 755 ${.CURDIR}/skeyinfo.sh \
+		${DESTDIR}${BINDIR}/skeyinfo
+	${INSTALL} ${COPY} -m 755 ${.CURDIR}/skeyprune.pl \
+		${DESTDIR}${BINDIR}/skeyprune
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/strip/Makefile b/usr.bin/strip/Makefile
index aa7a8026c26..0dd7c9701bc 100644
--- a/usr.bin/strip/Makefile
+++ b/usr.bin/strip/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:39:31 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:35 downsj Exp $
 
 PROG=	strip
 
 realinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 600 strip \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 strip \
 	    ${DESTDIR}${BINDIR}
 	./strip ${DESTDIR}${BINDIR}/strip
 	chmod ${BINMODE} ${DESTDIR}${BINDIR}/strip
diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile
index a13f97feee4..afa5882364e 100644
--- a/usr.bin/tput/Makefile
+++ b/usr.bin/tput/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:41:46 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:35 downsj Exp $
 #	$NetBSD: Makefile,v 1.3 1994/12/07 08:49:07 jtc Exp $
 
 PROG=	tput
@@ -7,7 +7,7 @@ LDADD=	-ltermcap
 MLINKS=	tput.1 clear.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/clear.sh ${DESTDIR}/usr/bin/clear
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile
index cc876f880f4..ace0696a683 100644
--- a/usr.bin/true/Makefile
+++ b/usr.bin/true/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:41:52 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:36 downsj Exp $
 
 MAN=	true.1
 
 beforeinstall:
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${.CURDIR}/true.sh ${DESTDIR}${BINDIR}/true
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index 4b6b5307b0e..ef47fa72f8e 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 1996/04/21 23:44:23 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:37 downsj Exp $
 
 PROG=	units
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${.CURDIR}/units.lib ${DESTDIR}/usr/share/misc
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile
index c922efac1cf..ff8460d09c2 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:42:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:37 downsj Exp $
 #	$NetBSD: Makefile,v 1.5 1994/12/23 21:11:56 pk Exp $
 
 PROG=	vfontedpr
@@ -13,13 +13,13 @@ vgrindefs.src.db: vgrindefs.src
 	cap_mkdb -f vgrindefs.src ${.CURDIR}/vgrindefs.src
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/vgrind.sh ${DESTDIR}/usr/bin/vgrind
-	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} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    ${.CURDIR}/vgrindefs.src ${DESTDIR}/usr/share/misc/vgrindefs
+	${INSTALL} ${COPY} -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 \
-	    ${DESTDIR}/usr/share/tmac
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	    ${.CURDIR}/tmac.vgrind ${DESTDIR}/usr/share/tmac
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/vim/Makefile b/usr.bin/vim/Makefile
index 054aaf1a4af..b0542757305 100644
--- a/usr.bin/vim/Makefile
+++ b/usr.bin/vim/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.5 1996/10/15 08:35:25 downsj Exp $
+#	$OpenBSD: Makefile,v 1.6 1996/12/08 14:32:38 downsj Exp $
 
 .PATH:	${.CURDIR}/doc
 
@@ -29,8 +29,8 @@ DOCS=	vim_40.txt vim_ami.txt vim_arch.txt vim_diff.txt vim_digr.txt \
 # I haven't tried this, but it's a start...
 # Use the following to build Motif vim:
 #SRCS+=	gui.c gui_motif.c gui_x11.c pty_openbsd.c
-#LDADD+=	-L/some/where/motif/lib -L/some/where/X11/lib -lXm -lXt -lX11 -lutil
-#CFLAGS+=	-I/some/where/motif/include -I/some/where/X11/include -DHAVE_X11 -DUSE_GUI_MOTIF
+#LDADD+=	-L/usr/local/LessTiff/lib -L/usr/local/X11R6.1/lib -lXm -lXt -lX11 -lutil
+#CFLAGS+=	-I/usr/local/LessTiff/include -I/usr/local/X11R6.1/include -DHAVE_X11 -DUSE_GUI_MOTIF
 # Use the following to build Athena vim:
 #SRCS+=	gui.c gui_athena.c gui_x11.c pty_openbsd.c gui_at_sb.c
 #LDADD+=	-L/some/where/X11/lib -lXaw -lXt -lXmu -lX11 -lutil
@@ -47,10 +47,10 @@ mkcmdtab: mkcmdtab.o
 	${CC} mkcmdtab.o -o mkcmdtab
 
 afterinstall:
-	install -d -m 555 -o ${BINOWN} -g ${BINGRP} ${DESTDIR}/usr/share/vim
+	${INSTALL} -d -m 555 -o ${BINOWN} -g ${BINGRP} ${DESTDIR}/usr/share/vim
 	cd ${.CURDIR}/doc; for i in ${DOCS}; do \
 		cmp -s $$i ${DESTDIR}/usr/share/vim/$$i || \
-		install -c -m 444 -o ${BINOWN} -g ${BINGRP} $$i \
+		${INSTALL} ${COPY} -m 444 -o ${BINOWN} -g ${BINGRP} $$i \
 		${DESTDIR}/usr/share/vim; done
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile
index 839ba2f78e5..0c1bd524cac 100644
--- a/usr.bin/which/Makefile
+++ b/usr.bin/which/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:42:57 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:39 downsj Exp $
 
 MAN=	which.1
 
 beforeinstall:
-	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/which.csh ${DESTDIR}${BINDIR}/which
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 47af6d60c64..9d5159f8c48 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:44:04 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:40 downsj Exp $
 #	$NetBSD: Makefile,v 1.7 1994/12/22 12:31:39 cgd Exp $
 
 PROG=	xinstall
@@ -7,7 +7,7 @@ MAN=	install.1
 .PATH:	${.CURDIR}/../../bin/ls
 
 realinstall:
-	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/xlint/llib/Makefile b/usr.bin/xlint/llib/Makefile
index ae5a9b4bac8..445a57f8358 100644
--- a/usr.bin/xlint/llib/Makefile
+++ b/usr.bin/xlint/llib/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:44:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:40 downsj Exp $
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:25:05 cgd Exp $
 
 LIBS=	llib-lposix.ln llib-lstdc.ln
@@ -6,7 +6,7 @@ LIBS=	llib-lposix.ln llib-lstdc.ln
 all:	${LIBS}
 
 install:
-	install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
 	    ${LIBS} ${DESTDIR}${LINTLIBDIR}
 
 clean cleanall:
diff --git a/usr.bin/xlint/xlint/Makefile b/usr.bin/xlint/xlint/Makefile
index 298ec6ac55e..7e6cfff794a 100644
--- a/usr.bin/xlint/xlint/Makefile
+++ b/usr.bin/xlint/xlint/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:44:29 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/12/08 14:32:41 downsj Exp $
 #	$NetBSD: Makefile,v 1.2 1995/07/03 21:25:14 cgd Exp $
 
 .PATH:	${.CURDIR}/../lint1
@@ -10,7 +10,7 @@ MAN=	lint.1
 CFLAGS+=-I${.CURDIR}/../lint1
 
 realinstall:
-	install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${PROG} ${DESTDIR}${BINDIR}/lint