summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/atc/Makefile4
-rw-r--r--games/caesar/Makefile4
-rw-r--r--games/cribbage/Makefile4
-rw-r--r--games/fish/Makefile4
-rw-r--r--games/fortune/datfiles/Makefile6
-rw-r--r--games/hack/Makefile8
-rw-r--r--games/larn/Makefile4
-rw-r--r--games/monop/Makefile4
-rw-r--r--games/quiz/Makefile4
-rw-r--r--games/robots/Makefile4
-rw-r--r--games/wargames/Makefile4
-rw-r--r--games/wump/Makefile4
-rw-r--r--gnu/lib/libg++/libg++/genclass/Makefile.bsd-wrapper4
-rw-r--r--gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper8
-rw-r--r--gnu/libexec/ld.so/ld.so/Makefile4
-rw-r--r--gnu/libexec/uucp/sample/Makefile4
-rw-r--r--gnu/libexec/uucp/uusched/Makefile4
-rw-r--r--gnu/libexec/uucp/uuto/Makefile4
-rw-r--r--gnu/usr.bin/cpio/Makefile4
-rw-r--r--gnu/usr.bin/gzip/Makefile4
-rw-r--r--gnu/usr.bin/rcs/Makefile.bsd-wrapper4
-rw-r--r--gnu/usr.bin/sendbug/Makefile4
-rw-r--r--include/Makefile6
-rw-r--r--lib/csu/alpha/Makefile4
-rw-r--r--lib/csu/c++/Makefile4
-rw-r--r--lib/csu/i386/Makefile4
-rw-r--r--lib/csu/m68k/Makefile4
-rw-r--r--lib/csu/mips/Makefile4
-rw-r--r--lib/csu/mvme88k/Makefile4
-rw-r--r--lib/csu/ns32k/Makefile4
-rw-r--r--lib/csu/powerpc/Makefile4
-rw-r--r--lib/csu/sparc/Makefile4
-rw-r--r--lib/csu/vax/Makefile4
-rw-r--r--lib/libc/Makefile4
-rw-r--r--lib/libcom_err/Makefile4
-rw-r--r--lib/libcompat/Makefile4
-rw-r--r--lib/libcurses/Makefile6
-rw-r--r--lib/libedit/Makefile4
-rw-r--r--lib/libform/Makefile2
-rw-r--r--lib/libmenu/Makefile2
-rw-r--r--lib/libocurses/Makefile2
-rw-r--r--lib/libpanel/Makefile2
-rw-r--r--lib/libpcap/Makefile4
-rw-r--r--lib/librpcsvc/Makefile6
-rw-r--r--lib/libskey/Makefile4
-rw-r--r--lib/libss/Makefile4
-rw-r--r--lib/libtermlib/Makefile4
-rw-r--r--lib/libutil/Makefile4
-rw-r--r--lib/libwrap/Makefile4
-rw-r--r--lib/libz/Makefile6
-rw-r--r--libexec/makewhatis/Makefile4
-rw-r--r--sbin/fastboot/Makefile6
-rw-r--r--sbin/mount_portal/Makefile4
-rw-r--r--share/mk/Makefile4
-rw-r--r--share/termcap/Makefile8
-rw-r--r--share/terminfo/Makefile4
-rw-r--r--sys/arch/i386/boot.dos/Makefile4
-rw-r--r--sys/arch/i386/stand/biosboot/Makefile4
-rw-r--r--sys/arch/i386/stand/boot/Makefile4
-rw-r--r--sys/arch/i386/stand/mbr/Makefile4
-rw-r--r--sys/arch/mvme68k/stand/netboot/Makefile4
-rw-r--r--sys/arch/mvme68k/stand/sboot/Makefile6
-rw-r--r--sys/arch/mvme88k/stand/netboot/Makefile4
-rw-r--r--sys/arch/mvme88k/stand/openbsd/netboot/Makefile4
-rw-r--r--sys/arch/mvme88k/stand/openbsd/sboot/Makefile6
-rw-r--r--sys/arch/mvme88k/stand/sboot/Makefile6
-rw-r--r--sys/arch/powerpc/stand/boot.mac/Makefile4
-rw-r--r--sys/arch/powerpc/stand/boot/Makefile4
-rw-r--r--sys/arch/sparc/stand/boot/Makefile2
-rw-r--r--sys/arch/sparc/stand/bootxx/Makefile2
-rw-r--r--sys/arch/sun3/stand/Makefile.inc2
-rw-r--r--sys/arch/sun3/stand/bootxx/Makefile2
-rw-r--r--usr.bin/calendar/Makefile6
-rw-r--r--usr.bin/compress/Makefile4
-rw-r--r--usr.bin/cpp/Makefile4
-rw-r--r--usr.bin/false/Makefile4
-rw-r--r--usr.bin/file/Makefile4
-rw-r--r--usr.bin/gprof/Makefile4
-rw-r--r--usr.bin/id/Makefile6
-rw-r--r--usr.bin/less/Makefile.bsd-wrapper6
-rw-r--r--usr.bin/lex/Makefile4
-rw-r--r--usr.bin/locate/locate/Makefile8
-rw-r--r--usr.bin/lorder/Makefile4
-rw-r--r--usr.bin/mail/Makefile6
-rw-r--r--usr.bin/mkdep/Makefile4
-rw-r--r--usr.bin/more/Makefile4
-rw-r--r--usr.bin/oldrdist/Makefile6
-rw-r--r--usr.bin/pagesize/Makefile4
-rw-r--r--usr.bin/shar/Makefile4
-rw-r--r--usr.bin/skey/Makefile8
-rw-r--r--usr.bin/strip/Makefile6
-rw-r--r--usr.bin/true/Makefile4
-rw-r--r--usr.bin/units/Makefile4
-rw-r--r--usr.bin/vgrind/Makefile10
-rw-r--r--usr.bin/vim/Makefile4
-rw-r--r--usr.bin/xinstall/Makefile6
-rw-r--r--usr.bin/xlint/llib/Makefile4
-rw-r--r--usr.bin/xlint/xlint/Makefile6
-rw-r--r--usr.sbin/adduser/Makefile4
-rw-r--r--usr.sbin/named/ndc/Makefile4
-rw-r--r--usr.sbin/named/nslookup/Makefile4
-rw-r--r--usr.sbin/named/reload/Makefile4
-rw-r--r--usr.sbin/named/restart/Makefile4
-rw-r--r--usr.sbin/sendmail/cf/cf/Makefile4
-rw-r--r--usr.sbin/sendmail/src/Makefile8
-rw-r--r--usr.sbin/sliplogin/Makefile4
-rw-r--r--usr.sbin/ypserv/ypinit/Makefile10
107 files changed, 241 insertions, 241 deletions
diff --git a/games/atc/Makefile b/games/atc/Makefile
index 62147a1bb1d..b291595c0b7 100644
--- a/games/atc/Makefile
+++ b/games/atc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:11 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:55:40 millert Exp $
# $NetBSD: Makefile,v 1.9 1995/03/21 15:03:38 cgd Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
@@ -24,7 +24,7 @@ beforeinstall:
else \
true ; \
fi
- (cd ${.CURDIR}/games; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} \
+ (cd ${.CURDIR}/games; ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
-m 400 ${GAMES} ${DESTDIR}/usr/share/games/atc)
.include <bsd.prog.mk>
diff --git a/games/caesar/Makefile b/games/caesar/Makefile
index d67aed0d337..3709b0204e3 100644
--- a/games/caesar/Makefile
+++ b/games/caesar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/12/08 15:36:13 downsj Exp $
+# $OpenBSD: Makefile,v 1.3 1997/04/27 20:55:41 millert Exp $
# $NetBSD: Makefile,v 1.4 1995/03/21 15:08:18 cgd Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
@@ -9,7 +9,7 @@ LDADD= -lm
MLINKS= caesar.6 rot13.6
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/rot13.sh ${DESTDIR}/usr/games/rot13
.include <bsd.prog.mk>
diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile
index 40ac1d11f2d..e830376468c 100644
--- a/games/cribbage/Makefile
+++ b/games/cribbage/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:13 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:55:42 millert Exp $
# $NetBSD: Makefile,v 1.5 1995/03/21 15:08:39 cgd Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
@@ -10,7 +10,7 @@ MAN= cribbage.6
HIDEGAME=hidegame
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/cribbage.n ${DESTDIR}/usr/share/games/cribbage.instr
.include <bsd.prog.mk>
diff --git a/games/fish/Makefile b/games/fish/Makefile
index 569154073b2..136cc636406 100644
--- a/games/fish/Makefile
+++ b/games/fish/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/12/08 15:36:14 downsj Exp $
+# $OpenBSD: Makefile,v 1.3 1997/04/27 20:55:42 millert Exp $
# $NetBSD: Makefile,v 1.6 1995/03/23 08:28:14 cgd Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
@@ -7,7 +7,7 @@ MAN= fish.6
HIDEGAME=hidegame
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/fish.instr ${DESTDIR}/usr/share/games/fish.instr
.include <bsd.prog.mk>
diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile
index 8297a0dca3d..e707799541f 100644
--- a/games/fortune/datfiles/Makefile
+++ b/games/fortune/datfiles/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1996/12/08 15:36:15 downsj Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:55:43 millert Exp $
# $NetBSD: Makefile,v 1.15 1996/02/29 00:21:16 jtc Exp $
# @(#)Makefile 8.2 (Berkeley) 4/19/94
@@ -26,9 +26,9 @@ STRFILE!=cd $(.CURDIR)/../strfile; \
all: ${BLDS}
install: ${SRCS} ${BLDS}
- (cd ${.CURDIR} && ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ (cd ${.CURDIR} && ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${SRCS} ${DESTDIR}/usr/share/games/fortune)
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${BLDS} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${BLDS} \
${DESTDIR}/usr/share/games/fortune
fortunes.dat fortunes2.dat fortunes2-o.dat limerick.dat startrek.dat zippy.dat:
diff --git a/games/hack/Makefile b/games/hack/Makefile
index bdf0d145f4b..c0225e2d93b 100644
--- a/games/hack/Makefile
+++ b/games/hack/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1997/03/28 18:51:47 tholo Exp $
+# $OpenBSD: Makefile,v 1.8 1997/04/27 20:55:44 millert Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
PROG= hack
@@ -30,11 +30,11 @@ makedefs: makedefs.c
${HOSTCC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${.CURDIR}/${.PREFIX}.c ${LDADD}
beforeinstall:
- ${INSTALL} ${COPY} -o root -g games -m 660 /dev/null \
+ ${INSTALL} ${INSTALL_COPY} -o root -g games -m 660 /dev/null \
${DESTDIR}/var/games/hackdir/perm
- ${INSTALL} ${COPY} -o root -g games -m 660 /dev/null \
+ ${INSTALL} ${INSTALL_COPY} -o root -g games -m 660 /dev/null \
${DESTDIR}/var/games/hackdir/record
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/help \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/help \
${.CURDIR}/hh ${.CURDIR}/data ${DESTDIR}/var/games/hackdir
rm -f ${DESTDIR}/var/games/hackdir/bones*
diff --git a/games/larn/Makefile b/games/larn/Makefile
index 073abac34f6..332bb7c2796 100644
--- a/games/larn/Makefile
+++ b/games/larn/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:16 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:55:45 millert Exp $
# $NetBSD: Makefile,v 1.8 1995/04/22 07:34:00 cgd Exp $
# @(#)Makefile 5.12 (Berkeley) 5/30/93
@@ -64,7 +64,7 @@ LDADD= -ltermcap -lcompat
HIDEGAME=hidegame
beforeinstall:
- (cd ${.CURDIR}/datfiles; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} \
+ (cd ${.CURDIR}/datfiles; ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
-m 444 larnmaze larnopts larn.help \
${DESTDIR}/usr/share/games/larn)
diff --git a/games/monop/Makefile b/games/monop/Makefile
index 4ac615effa9..93f71c47dec 100644
--- a/games/monop/Makefile
+++ b/games/monop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 15:36:17 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:55:46 millert Exp $
# $NetBSD: Makefile,v 1.12 1995/03/23 08:34:32 cgd Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
@@ -20,7 +20,7 @@ initdeck: initdeck.c
${HOSTCC} ${CFLAGS} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${.CURDIR}/initdeck.c ${LDADD}
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 cards.pck \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 cards.pck \
${DESTDIR}/usr/share/games
.include <bsd.prog.mk>
diff --git a/games/quiz/Makefile b/games/quiz/Makefile
index 18a8784ec6e..8d31af0a044 100644
--- a/games/quiz/Makefile
+++ b/games/quiz/Makefile
@@ -11,7 +11,7 @@ CATS= africa america areas arith asia babies bard chinese collectives \
HIDEGAME=hidegame
beforeinstall:
- (cd ${.CURDIR}/datfiles; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} \
- -m 444 ${CATS} ${DESTDIR}/usr/share/games/quiz.db)
+ (cd ${.CURDIR}/datfiles; ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} \
+ -g ${BINGRP} -m 444 ${CATS} ${DESTDIR}/usr/share/games/quiz.db)
.include <bsd.prog.mk>
diff --git a/games/robots/Makefile b/games/robots/Makefile
index f6baaba9b21..0b6e04b8855 100644
--- a/games/robots/Makefile
+++ b/games/robots/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/02/05 18:26:07 kstailey Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:55:47 millert Exp $
# $NetBSD: Makefile,v 1.5 1995/04/22 10:08:46 cgd Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
@@ -12,7 +12,7 @@ LDADD= -lcurses -ltermlib
HIDEGAME=hidegame
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
${DESTDIR}/var/games/robots_roll
.include <bsd.prog.mk>
diff --git a/games/wargames/Makefile b/games/wargames/Makefile
index eceab82583c..2b3db98a201 100644
--- a/games/wargames/Makefile
+++ b/games/wargames/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/12/08 15:36:19 downsj Exp $
+# $OpenBSD: Makefile,v 1.3 1997/04/27 20:55:48 millert Exp $
# $NetBSD: Makefile,v 1.4 1995/04/22 07:53:41 cgd Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
@@ -6,7 +6,7 @@ NOOBJ= noobj
all wargames clean cleandir depend lint tags:
install:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/wargames.sh ${DESTDIR}/usr/games/wargames
.include <bsd.prog.mk>
diff --git a/games/wump/Makefile b/games/wump/Makefile
index b9dde2d14e7..b0d3efb30f1 100644
--- a/games/wump/Makefile
+++ b/games/wump/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1996/12/08 15:36:20 downsj Exp $
+# $OpenBSD: Makefile,v 1.3 1997/04/27 20:55:49 millert Exp $
# $NetBSD: Makefile,v 1.4 1995/04/22 08:19:45 cgd Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
@@ -7,7 +7,7 @@ MAN= wump.6
HIDEGAME=hidegame
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/wump.info ${DESTDIR}/usr/share/games
.include <bsd.prog.mk>
diff --git a/gnu/lib/libg++/libg++/genclass/Makefile.bsd-wrapper b/gnu/lib/libg++/libg++/genclass/Makefile.bsd-wrapper
index ad053447caf..cea5537422a 100644
--- a/gnu/lib/libg++/libg++/genclass/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libg++/genclass/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.1 1996/03/16 05:18:47 etheisen Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.2 1997/04/27 20:55:50 millert Exp $
PROG= genclass
SRCS=
@@ -6,7 +6,7 @@ NOMAN=
CLEANFILES+= genclass.tmp sedscript my.out
install:
- install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ install ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${PROG} ${DESTDIR}/usr/bin
tags:
diff --git a/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper b/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
index c73be4754f3..3daa398f4f4 100644
--- a/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.8 1997/01/19 22:46:48 graichen Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.9 1997/04/27 20:55:51 millert Exp $
.if defined(OBJMACHINE)
OBJDIR= obj.${MACHINE}
@@ -64,11 +64,11 @@ install: maninstall
.else
install:
.endif
- install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- ${PROG} ${DESTDIR}/usr/bin
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} \
+ -m ${BINMODE} ${PROG} ${DESTDIR}/usr/bin
@-cd $(.CURDIR); for i in gperf.info*; do \
cmp -s $$i $(DESTDIR)/usr/share/info/$$i || \
- install -c -o $(BINOWN) -g $(BINGRP) -m $(NONBINMODE) \
+ ${INSTALL} -c -o $(BINOWN) -g $(BINGRP) -m $(NONBINMODE) \
$$i $(DESTDIR)/usr/share/info/$$i; \
done
diff --git a/gnu/libexec/ld.so/ld.so/Makefile b/gnu/libexec/ld.so/ld.so/Makefile
index 077129bce79..b637fead325 100644
--- a/gnu/libexec/ld.so/ld.so/Makefile
+++ b/gnu/libexec/ld.so/ld.so/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/09/26 12:22:02 deraadt Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:55:51 millert Exp $
SUBDIR= # libdl
@@ -9,7 +9,7 @@ SRCS= boot1.c hash.c readelflib1.c vsprintf.c elfinterp.c
PROG= ld.so
MAN= ld.so.8
BINDIR=/usr/libexec
-STRIP=
+INSTALL_STRIP=
.PATH: ${.CURDIR}/${MACHINE_ARCH}
diff --git a/gnu/libexec/uucp/sample/Makefile b/gnu/libexec/uucp/sample/Makefile
index 9070559501b..85ff41978af 100644
--- a/gnu/libexec/uucp/sample/Makefile
+++ b/gnu/libexec/uucp/sample/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1996/12/08 22:39:32 tholo Exp $
+# $OpenBSD: Makefile,v 1.2 1997/04/27 20:55:52 millert Exp $
FILES= call config dial dialcode passwd port sys
NOOBJ= noobj
@@ -7,7 +7,7 @@ install:
@echo installing ${FILES}
@-for i in ${FILES}; do \
if [ ! -f ${DESTDIR}/etc/uucp/$$i ]; then \
- ${INSTALL} ${COPY} -o root -g wheel -m 644 $$i \
+ ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 $$i \
${DESTDIR}/etc/uucp; \
fi; \
done
diff --git a/gnu/libexec/uucp/uusched/Makefile b/gnu/libexec/uucp/uusched/Makefile
index d426a2f7358..da81f334d44 100644
--- a/gnu/libexec/uucp/uusched/Makefile
+++ b/gnu/libexec/uucp/uusched/Makefile
@@ -1,5 +1,5 @@
# Makefile for uusched
-# $Id: Makefile,v 1.1 1995/10/18 08:38:43 deraadt Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:55:53 millert Exp $
BINDIR= $(bindir)
@@ -13,7 +13,7 @@ uusched: uusched.in
$(.CURDIR)/uusched.in > $(.TARGET)
install:
- install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ install ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
uusched ${DESTDIR}${BINDIR}
.include <bsd.prog.mk>
diff --git a/gnu/libexec/uucp/uuto/Makefile b/gnu/libexec/uucp/uuto/Makefile
index 7d93ac6fbf1..be3f3715a84 100644
--- a/gnu/libexec/uucp/uuto/Makefile
+++ b/gnu/libexec/uucp/uuto/Makefile
@@ -1,5 +1,5 @@
# Makefile for uuto
-# $Id: Makefile,v 1.1 1995/10/18 08:38:44 deraadt Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:55:54 millert Exp $
BINDIR= $(bindir)
@@ -13,7 +13,7 @@ uuto: uuto.in
$(.CURDIR)/uuto.in > $(.TARGET)
install:
- install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ install ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
uuto ${DESTDIR}${BINDIR}
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cpio/Makefile b/gnu/usr.bin/cpio/Makefile
index d29d7651288..9f0fd7d5ea6 100644
--- a/gnu/usr.bin/cpio/Makefile
+++ b/gnu/usr.bin/cpio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1997/01/26 09:35:10 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:55:55 millert Exp $
# $NetBSD: Makefile,v 1.3 1995/04/23 07:58:27 cgd Exp $
PROG= cpio
@@ -18,7 +18,7 @@ cpio.info: cpio.texi
${MAKEINFO} -I${.CURDIR} ${.CURDIR}/cpio.texi
beforeinstall:
- ${INSTALL} ${COPY} -m 444 -o ${BINOWN} -g ${BINGRP} *.info* \
+ ${INSTALL} ${INSTALL_COPY} -m 444 -o ${BINOWN} -g ${BINGRP} *.info* \
${DESTDIR}/usr/share/info
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/gzip/Makefile b/gnu/usr.bin/gzip/Makefile
index ecfe2e21a52..c593e2ea75b 100644
--- a/gnu/usr.bin/gzip/Makefile
+++ b/gnu/usr.bin/gzip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1997/01/26 09:53:18 downsj Exp $
+# $OpenBSD: Makefile,v 1.7 1997/04/27 20:55:56 millert Exp $
# $NetBSD: Makefile,v 1.17 1995/10/24 22:18:34 jtc Exp $
PROG= gzip
@@ -33,7 +33,7 @@ gzip.info: gzip.texi
${MAKEINFO} -I${.CURDIR} ${.CURDIR}/gzip.texi
beforeinstall:
- ${INSTALL} ${COPY} -m 444 -o ${BINOWN} -g ${BINGRP} *.info* \
+ ${INSTALL} ${INSTALL_COPY} -m 444 -o ${BINOWN} -g ${BINGRP} *.info* \
${DESTDIR}/usr/share/info
afterinstall:
diff --git a/gnu/usr.bin/rcs/Makefile.bsd-wrapper b/gnu/usr.bin/rcs/Makefile.bsd-wrapper
index ae4b3e6b162..fdf3a0917a0 100644
--- a/gnu/usr.bin/rcs/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/rcs/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.7 1997/04/21 08:41:17 downsj Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.8 1997/04/27 20:55:57 millert Exp $
MAN= man/ci.1 man/co.1 man/ident.1 man/merge.1 man/rcs.1 man/rcsclean.1 \
man/rcsdiff.1 man/rcsfile.5 man/rcsfreeze.1 man/rcsintro.1 \
@@ -30,7 +30,7 @@ man/rcsfile.cat5: rcsfile.5
install: maninstall
${MAKE} ${GNUCFLAGS} prefix=${DESTDIR}/usr \
bindir=${DESTDIR}/usr/bin INSTALL_MAN= install
- install ${COPY_FLAG} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ install ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/src/rcsfreeze.sh ${DESTDIR}/usr/bin/rcsfreeze
clean cleandir:
diff --git a/gnu/usr.bin/sendbug/Makefile b/gnu/usr.bin/sendbug/Makefile
index 4e92fd1de4b..eb9d12853ab 100644
--- a/gnu/usr.bin/sendbug/Makefile
+++ b/gnu/usr.bin/sendbug/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 1996/06/27 21:09:06 tholo Exp $
+# $OpenBSD: Makefile,v 1.2 1997/04/27 20:55:57 millert Exp $
MAN= sendbug.1
beforeinstall:
- install ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ install ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/sendbug.sh ${DESTDIR}${BINDIR}/sendbug
.include <bsd.prog.mk>
diff --git a/include/Makefile b/include/Makefile
index f3b9ba4d9ba..a3137decaa2 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 1997/04/19 21:26:15 millert Exp $
+# $OpenBSD: Makefile,v 1.40 1997/04/27 20:55:58 millert Exp $
# $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
# @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91
@@ -52,7 +52,7 @@ includes:
@echo installing ${FILES}
@-for i in ${FILES}; do \
cmp -s $$i ${DESTDIR}/usr/include/$$i || \
- ${INSTALL} ${COPY} -m 444 $$i ${DESTDIR}/usr/include/$$i; \
+ ${INSTALL} ${INSTALL_COPY} -m 444 $$i ${DESTDIR}/usr/include/$$i; \
done
@echo installing ${DIRS}
@-for i in ${DIRS}; do \
@@ -60,7 +60,7 @@ includes:
${DESTDIR}/usr/include/$$i; \
(cd $$i; for j in *.[ih]; do \
cmp -s $$j ${DESTDIR}/usr/include/$$i/$$j || \
- ${INSTALL} ${COPY} -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
+ ${INSTALL} ${INSTALL_COPY} -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
done); \
done
@echo installing ${LFILES}
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
diff --git a/libexec/makewhatis/Makefile b/libexec/makewhatis/Makefile
index df64d5d106f..d39355c78dd 100644
--- a/libexec/makewhatis/Makefile
+++ b/libexec/makewhatis/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 1996/12/08 15:17:19 downsj Exp $
+# $OpenBSD: Makefile,v 1.3 1997/04/27 20:56:20 millert Exp $
NOMAN=
NOPROG=
NOOBJ=
afterinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/makewhatis.sh ${DESTDIR}${BINDIR}/makewhatis
.include <bsd.prog.mk>
diff --git a/sbin/fastboot/Makefile b/sbin/fastboot/Makefile
index 22577514bd0..49a6d8d677d 100644
--- a/sbin/fastboot/Makefile
+++ b/sbin/fastboot/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 1996/12/08 14:37:22 downsj Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:21 millert Exp $
# $NetBSD: Makefile,v 1.7 1995/03/18 14:55:27 cgd Exp $
MAN= fastboot.8
MLINKS= fastboot.8 fasthalt.8
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/fastboot.sh ${DESTDIR}${BINDIR}/fastboot
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/fasthalt.sh ${DESTDIR}${BINDIR}/fasthalt
.include <bsd.prog.mk>
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 1e77debe67a..a55a5febcd0 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/03/23 04:43:22 millert Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:22 millert Exp $
# $NetBSD: Makefile,v 1.10 1995/03/18 14:57:50 cgd Exp $
PROG= mount_portal
@@ -14,6 +14,6 @@ CFLAGS+= -I${.CURDIR}/../../sys -I${MOUNT}
afterinstall:
if [ ! -f ${DESTDIR}/etc/portal.conf ]; then \
- ${INSTALL} ${COPY} -o root -g wheel -m 644 \
+ ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 644 \
${.CURDIR}/portal.conf ${DESTDIR}/etc; \
fi
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 4c814439ca8..37668b471c6 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1996/12/08 14:42:26 downsj Exp $
+# $OpenBSD: Makefile,v 1.7 1997/04/27 20:56:23 millert Exp $
# $NetBSD: Makefile,v 1.12 1995/10/22 00:45:53 christos Exp $
FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \
@@ -7,7 +7,7 @@ FILES= bsd.README bsd.doc.mk bsd.dep.mk bsd.lib.mk bsd.man.mk bsd.nls.mk \
NOOBJ= noobj
install:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \
${DESTDIR}${BINDIR}/mk
.include <bsd.prog.mk>
diff --git a/share/termcap/Makefile b/share/termcap/Makefile
index 802ca99b7d3..e33fa6597d8 100644
--- a/share/termcap/Makefile
+++ b/share/termcap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1996/10/06 20:57:05 tholo Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:24 millert Exp $
# from: @(#)Makefile 5.14 (Berkeley) 9/15/92
MAN= termcap.5
@@ -14,11 +14,11 @@ termcap.db: termcap.src
cap_mkdb -f termcap ${.OBJDIR}/fixed
realinstall:
- install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap.db \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 termcap.db \
${DESTDIR}${BINDIR}/misc/termcap.db
- install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.src \
+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.src \
${DESTDIR}${BINDIR}/misc/termcap
- install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \
+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/map3270 \
${DESTDIR}${BINDIR}/misc/map3270
ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
diff --git a/share/terminfo/Makefile b/share/terminfo/Makefile
index 08c5122dee5..339bd2a332b 100644
--- a/share/terminfo/Makefile
+++ b/share/terminfo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 1996/07/22 04:46:01 tholo Exp $
+# $OpenBSD: Makefile,v 1.2 1997/04/27 20:56:25 millert Exp $
#MAN= terminfo.5
@@ -13,7 +13,7 @@ terminfo.db: terminfo.src
info_mkdb -f terminfo ${.OBJDIR}/fixed
realinstall:
- install ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 terminfo.db \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 terminfo.db \
${DESTDIR}${BINDIR}/misc/terminfo.db
.include <bsd.prog.mk>
diff --git a/sys/arch/i386/boot.dos/Makefile b/sys/arch/i386/boot.dos/Makefile
index 2ccc2500b4f..6be426a0114 100644
--- a/sys/arch/i386/boot.dos/Makefile
+++ b/sys/arch/i386/boot.dos/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/01/02 16:37:53 etheisen Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:26 millert Exp $
# $NetBSD: Makefile,v 1.18 1995/03/23 19:46:45 jtc Exp $
#
# Ported to boot 386BSD by Julian Elischer (julian@tfs.com)
@@ -27,7 +27,7 @@
PROG= boot.com
NOMAN= noman
-STRIP=
+INSTALL_STRIP=
S= ${.CURDIR}/../../..
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile
index 5892f9824bf..31dc4d9f445 100644
--- a/sys/arch/i386/stand/biosboot/Makefile
+++ b/sys/arch/i386/stand/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/04/21 20:31:00 mickey Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:27 millert Exp $
PROG= biosboot
SRCS= biosboot.S
@@ -6,7 +6,7 @@ SRCS= biosboot.S
CPPFLAGS+=-DSTART=$(START) -DBOOTMAGIC=$(BOOTMAGIC) -DBOOTREL=$(BOOTREL)
LD=ld
LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic
-STRIP=
+INSTALL_STRIP=
MAN= biosboot.8
all: machine-links
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index b46aaa47ff5..b6169356862 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/04/18 17:53:13 mickey Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:28 millert Exp $
PROG= boot
SRCS= srt0.S boot.c cmd.c conf.c
@@ -7,7 +7,7 @@ AFLAGS+=-Wa,-R
# AFLAGS+=-Wa,-a
LD=ld
LDFLAGS+=-nostdlib -Ttext $(START) -z -x -e start_boot -Bstatic
-STRIP=
+INSTALL_STRIP=
MAN= boot.8
SADIR=${.CURDIR}/..
diff --git a/sys/arch/i386/stand/mbr/Makefile b/sys/arch/i386/stand/mbr/Makefile
index ae3e65fc3a3..0d06a0c70e8 100644
--- a/sys/arch/i386/stand/mbr/Makefile
+++ b/sys/arch/i386/stand/mbr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1997/04/21 20:31:00 mickey Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:29 millert Exp $
#
PROG= mbr
@@ -7,7 +7,7 @@ AFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../.. #-Wa,-a
LD=ld
LDFLAGS=-nostdlib -Ttext 0 -x -N -s -Bstatic
MAN+= mbr.8
-STRIP=
+INSTALL_STRIP=
# Uncomment this to make mbr talk to a serial port.
#CPPFLAGS+=-DSERIAL=0
diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile
index 8c6a70b860e..dcde93b7057 100644
--- a/sys/arch/mvme68k/stand/netboot/Makefile
+++ b/sys/arch/mvme68k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1997/04/22 16:13:43 gvf Exp $
+# $OpenBSD: Makefile,v 1.7 1997/04/27 20:56:30 millert Exp $
RELOC=0x3F0000
SIZE?= size
@@ -32,7 +32,7 @@ netboot.bin: netboot
dd ibs=32 skip=1 if=netboot of=$@
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
netboot.bin ${DESTDIR}${MDEC_DIR}/netboot
.include <bsd.prog.mk>
diff --git a/sys/arch/mvme68k/stand/sboot/Makefile b/sys/arch/mvme68k/stand/sboot/Makefile
index 48bf0b26df7..19b444f8352 100644
--- a/sys/arch/mvme68k/stand/sboot/Makefile
+++ b/sys/arch/mvme68k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/04/22 16:13:44 gvf Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:30 millert Exp $
S= ${.CURDIR}/../../../..
INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -35,9 +35,9 @@ rboot: rboot.tmp srec
dd ibs=32 skip=1 if=rboot.tmp | ${.OBJDIR}/srec 4 0x4000 rboot > rboot
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
sboot ${DESTDIR}${MDEC_DIR}/sboot
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
rboot ${DESTDIR}${MDEC_DIR}/rboot
.include <bsd.prog.mk>
diff --git a/sys/arch/mvme88k/stand/netboot/Makefile b/sys/arch/mvme88k/stand/netboot/Makefile
index 2036c5d5c11..9d9d9cfc850 100644
--- a/sys/arch/mvme88k/stand/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/03/03 19:30:39 rahnds Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:56:32 millert Exp $
RELOC=0x3F0000
@@ -25,7 +25,7 @@ netboot.bin: netboot
dd ibs=32 skip=1 if=netboot of=$@
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
netboot.bin ${DESTDIR}${MDEC_DIR}/netboot
.include <bsd.prog.mk>
diff --git a/sys/arch/mvme88k/stand/openbsd/netboot/Makefile b/sys/arch/mvme88k/stand/openbsd/netboot/Makefile
index 97900f2351c..dd675f294da 100644
--- a/sys/arch/mvme88k/stand/openbsd/netboot/Makefile
+++ b/sys/arch/mvme88k/stand/openbsd/netboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/03/03 19:31:08 rahnds Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:56:33 millert Exp $
RELOC=0x3F0000
@@ -25,7 +25,7 @@ netboot.bin: netboot
dd ibs=32 skip=1 if=netboot of=$@
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
netboot.bin ${DESTDIR}${MDEC_DIR}/netboot
.include <bsd.prog.mk>
diff --git a/sys/arch/mvme88k/stand/openbsd/sboot/Makefile b/sys/arch/mvme88k/stand/openbsd/sboot/Makefile
index 95b897d90c2..076deb2e306 100644
--- a/sys/arch/mvme88k/stand/openbsd/sboot/Makefile
+++ b/sys/arch/mvme88k/stand/openbsd/sboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/03/03 19:31:10 rahnds Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:56:34 millert Exp $
S= ${.CURDIR}/../../../..
INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -31,9 +31,9 @@ rboot: rboot.tmp srec
dd ibs=32 skip=1 if=rboot.tmp | ${.OBJDIR}/srec 4 0x4000 rboot > rboot
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
sboot ${DESTDIR}${MDEC_DIR}/sboot
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
rboot ${DESTDIR}${MDEC_DIR}/rboot
.include <bsd.prog.mk>
diff --git a/sys/arch/mvme88k/stand/sboot/Makefile b/sys/arch/mvme88k/stand/sboot/Makefile
index b1bb7bfe205..076deb2e306 100644
--- a/sys/arch/mvme88k/stand/sboot/Makefile
+++ b/sys/arch/mvme88k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1997/03/03 19:30:41 rahnds Exp $
+# $Id: Makefile,v 1.2 1997/04/27 20:56:34 millert Exp $
S= ${.CURDIR}/../../../..
INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
@@ -31,9 +31,9 @@ rboot: rboot.tmp srec
dd ibs=32 skip=1 if=rboot.tmp | ${.OBJDIR}/srec 4 0x4000 rboot > rboot
install:
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
sboot ${DESTDIR}${MDEC_DIR}/sboot
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
rboot ${DESTDIR}${MDEC_DIR}/rboot
.include <bsd.prog.mk>
diff --git a/sys/arch/powerpc/stand/boot.mac/Makefile b/sys/arch/powerpc/stand/boot.mac/Makefile
index d49130243a6..2ad27f5be94 100644
--- a/sys/arch/powerpc/stand/boot.mac/Makefile
+++ b/sys/arch/powerpc/stand/boot.mac/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 1997/04/01 21:01:48 rahnds Exp $
+# $OpenBSD: Makefile,v 1.3 1997/04/27 20:56:35 millert Exp $
# $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $
R= ..
@@ -11,7 +11,7 @@ SRCS= Locore.c boot.c ofdev.c net.c netif_of.c alloc.c
#CFLAGS+= -DDEBUG -DNETIF_DEBUG
CFLAGS+= -DEXEC_ELF
NOMAN=
-STRIP=
+INSTALL_STRIP=
MAKEELF= makeelf
BINDIR= /usr/mdec
OBJCOPY?= objcopy
diff --git a/sys/arch/powerpc/stand/boot/Makefile b/sys/arch/powerpc/stand/boot/Makefile
index 0200cdfd3a6..e8eb2c59ca6 100644
--- a/sys/arch/powerpc/stand/boot/Makefile
+++ b/sys/arch/powerpc/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/04/01 21:01:45 rahnds Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:36 millert Exp $
# $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $
R= ..
@@ -8,7 +8,7 @@ SRCS= Locore.c boot.c ofdev.c net.c netif_of.c alloc.c
#CFLAGS+= -DDEBUG -DNETIF_DEBUG
CFLAGS+= -DEXEC_ELF
NOMAN=
-STRIP=
+INSTALL_STRIP=
MAKEELF= makeelf
BINDIR= /usr/mdec
#OBJS+= note.o
diff --git a/sys/arch/sparc/stand/boot/Makefile b/sys/arch/sparc/stand/boot/Makefile
index f4b8ae169d6..13034201f2f 100644
--- a/sys/arch/sparc/stand/boot/Makefile
+++ b/sys/arch/sparc/stand/boot/Makefile
@@ -4,7 +4,7 @@ R= ..
.PATH: ${.CURDIR}/${R}
PROG= boot
SRCS= srt0.S boot.c promdev.c dvma.c net.c netif_sun.c conf.c version.c
-STRIP=
+INSTALL_STRIP=
NOMAN= 1
BINDIR= /usr/mdec
LIBS!= cd ${.CURDIR}/${R}; ${MAKE} libdep
diff --git a/sys/arch/sparc/stand/bootxx/Makefile b/sys/arch/sparc/stand/bootxx/Makefile
index 432056022e2..512405c14c6 100644
--- a/sys/arch/sparc/stand/bootxx/Makefile
+++ b/sys/arch/sparc/stand/bootxx/Makefile
@@ -6,7 +6,7 @@ PROG= bootxx
SRCS= srt0.S bootxx.c promdev.c dvma.c
KOBJS= __main.o bzero.o urem.o udiv.o
NOMAN= 1
-STRIP=
+INSTALL_STRIP=
BINDIR= /usr/mdec
CFLAGS= -DBOOTXX
diff --git a/sys/arch/sun3/stand/Makefile.inc b/sys/arch/sun3/stand/Makefile.inc
index d6d6a9b9450..30281168835 100644
--- a/sys/arch/sun3/stand/Makefile.inc
+++ b/sys/arch/sun3/stand/Makefile.inc
@@ -43,7 +43,7 @@ clean:
.if !target(install)
install: ${SA_PROG}.bin
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${SA_PROG}.bin ${DESTDIR}${MDEC_DIR}/${SA_PROG}
.endif
diff --git a/sys/arch/sun3/stand/bootxx/Makefile b/sys/arch/sun3/stand/bootxx/Makefile
index c8e56066b72..44ef26b218c 100644
--- a/sys/arch/sun3/stand/bootxx/Makefile
+++ b/sys/arch/sun3/stand/bootxx/Makefile
@@ -7,7 +7,7 @@ all: ${SA_PROG}
# Do not strip or remove a.out header for this one.
install: ${SA_PROG}
- install ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
${SA_PROG} ${DESTDIR}${MDEC_DIR}/${SA_PROG}
.include <bsd.prog.mk>
diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index c45bbe9cfb2..a5b7e4c0c7a 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1996/12/08 14:32:16 downsj Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:40 millert 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} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${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} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${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 25706b17743..b242296cba6 100644
--- a/usr.bin/compress/Makefile
+++ b/usr.bin/compress/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1997/02/10 12:33:49 mickey Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:41 millert Exp $
# $NetBSD: Makefile,v 1.6 1995/03/26 09:44:29 glass Exp $
PROG= compress
@@ -9,7 +9,7 @@ MLINKS= compress.1 uncompress.1
#MLINKS+=compress.1 zcat.1
#afterinstall:
-# ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+# ${INSTALL} ${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 23f5369ad00..e6099c5ac82 100644
--- a/usr.bin/cpp/Makefile
+++ b/usr.bin/cpp/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 1996/12/08 14:32:21 downsj Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:42 millert Exp $
NOMAN=
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${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 aa08c801bdf..74ee728e795 100644
--- a/usr.bin/false/Makefile
+++ b/usr.bin/false/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:23 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:42 millert Exp $
MAN= false.1
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${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 705f59792cc..66e47d081a8 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1997/02/09 23:58:15 millert Exp $
+# $OpenBSD: Makefile,v 1.7 1997/04/27 20:56:43 millert 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} ${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 33cdfd66b97..60782f67d66 100644
--- a/usr.bin/gprof/Makefile
+++ b/usr.bin/gprof/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 1996/12/08 14:32:25 downsj Exp $
+# $OpenBSD: Makefile,v 1.5 1997/04/27 20:56:44 millert 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} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${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 fb374a30c54..8c0f9461f5d 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:26 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:45 millert Exp $
PROG= id
MAN= id.1 groups.1 whoami.1
afterinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/groups.sh ${DESTDIR}/usr/bin/groups
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/whoami.sh ${DESTDIR}/usr/bin/whoami
.include <bsd.prog.mk>
diff --git a/usr.bin/less/Makefile.bsd-wrapper b/usr.bin/less/Makefile.bsd-wrapper
index b3f5f7a16bb..7dcfad27ddf 100644
--- a/usr.bin/less/Makefile.bsd-wrapper
+++ b/usr.bin/less/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.8 1997/01/23 02:24:22 niklas Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.9 1997/04/27 20:56:46 millert Exp $
#
# less config
@@ -72,8 +72,8 @@ gnu_install:
${MAKE} ${WCC} ${WCFLAGS} ${WLDFLAGS} LIBS=${LIBS} \
LESS_HLP=${LESS_HLP} bindir=${DESTDIR}${BINDIR} \
datadir=${DESTDIR}${PREFIX}/share/misc \
- INSTALL_PROGRAM="${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}" \
- INSTALL_DATA="${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444" \
+ INSTALL_PROGRAM="${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}" \
+ INSTALL_DATA="${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444" \
INSTALL_MAN= INSTALLDIRS= install
clean cleandir:
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index c767ac0c350..aa0f5c7c577 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:27 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:46 millert 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} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${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 3548b283b73..0add831dda6 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.8 1996/12/08 14:32:28 downsj Exp $
+# $OpenBSD: Makefile,v 1.9 1997/04/27 20:56:47 millert Exp $
#
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.8 1996/12/08 14:32:28 downsj Exp $
+# $Id: Makefile,v 1.9 1997/04/27 20:56:47 millert Exp $
PROG= locate
SRCS= util.c locate.c
@@ -13,13 +13,13 @@ MLINKS+= locate.updatedb.8 updatedb.8
beforeinstall:
-@for i in ${SCRIPTS}; do \
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m \
+ ${INSTALL} ${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} ${COPY} -o root -g wheel -m 644 \
+# ${INSTALL} ${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 05c38b68968..ab958f6bbeb 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/01/02 20:48:29 rahnds Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:48 millert Exp $
# $NetBSD: Makefile,v 1.9 1995/12/18 07:59:12 jonathan Exp $
MAN= lorder.1
@@ -12,7 +12,7 @@ SCRIPT= lorder.sh
.endif
realinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${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 b8c0bd5bfde..28e7d78af58 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/03/29 03:01:43 millert Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:49 millert 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} ${COPY} -o ${BINOWN} -g ${BINGRP} \
+ cd ${.CURDIR}/misc; ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
-m 444 ${SFILES} ${DESTDIR}/usr/share/misc
- cd ${.CURDIR}/misc; ${INSTALL} ${COPY} -o root -g wheel \
+ cd ${.CURDIR}/misc; ${INSTALL} ${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 b1424ded291..f321659f8a9 100644
--- a/usr.bin/mkdep/Makefile
+++ b/usr.bin/mkdep/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:30 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:50 millert Exp $
# $NetBSD: Makefile,v 1.6 1994/12/23 07:34:55 jtc Exp $
MAN= mkdep.1
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${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 459b2714ea9..94e834fd1cb 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 1996/12/08 14:32:31 downsj Exp $
+# $OpenBSD: Makefile,v 1.7 1997/04/27 20:56:51 millert 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} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${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 dca59a23cec..e82932c2bbb 100644
--- a/usr.bin/oldrdist/Makefile
+++ b/usr.bin/oldrdist/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1996/12/08 14:32:31 downsj Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:51 millert 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} \
- ${PROG} ${DESTDIR}${BINDIR}/oldrdist
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_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 14fe38373d1..92771b5a963 100644
--- a/usr.bin/pagesize/Makefile
+++ b/usr.bin/pagesize/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:32 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:52 millert 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} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${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 b965e98172f..1a8026a505d 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:33 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:53 millert Exp $
# $NetBSD: Makefile,v 1.6 1994/12/22 12:30:52 cgd Exp $
MAN= shar.1
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${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 5111ca7edcd..d7dbf376e51 100644
--- a/usr.bin/skey/Makefile
+++ b/usr.bin/skey/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 1996/12/08 14:32:34 downsj Exp $
+# $OpenBSD: Makefile,v 1.9 1997/04/27 20:56:54 millert Exp $
PROG= skey
MAN= skey.1 skeyinfo.1 skeyaudit.1 skeyprune.8
@@ -12,11 +12,11 @@ DPADD= ${LIBSKEY}
LDADD= -lskey
beforeinstall:
- ${INSTALL} ${COPY} -m 755 ${.CURDIR}/skeyaudit.sh \
+ ${INSTALL} ${INSTALL_COPY} -m 755 ${.CURDIR}/skeyaudit.sh \
${DESTDIR}${BINDIR}/skeyaudit
- ${INSTALL} ${COPY} -m 755 ${.CURDIR}/skeyinfo.sh \
+ ${INSTALL} ${INSTALL_COPY} -m 755 ${.CURDIR}/skeyinfo.sh \
${DESTDIR}${BINDIR}/skeyinfo
- ${INSTALL} ${COPY} -m 755 ${.CURDIR}/skeyprune.pl \
+ ${INSTALL} ${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 cea2c117ea6..3cba7c051c9 100644
--- a/usr.bin/strip/Makefile
+++ b/usr.bin/strip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1997/02/13 00:12:07 deraadt Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:56:54 millert Exp $
PROG= strip
.if ${HOSTCC} != ${CC}
@@ -13,10 +13,10 @@ STRIP=./strip
.endif
realinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 strip \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 600 strip \
${DESTDIR}${BINDIR}
${STRIP} ${DESTDIR}${BINDIR}/strip
chmod ${BINMODE} ${DESTDIR}${BINDIR}/strip
- -if [ "${COPY}" = "" ]; then rm -f ${STRIP}; fi
+ -if [ "${INSTALL_COPY}" = "" ]; then rm -f ${STRIP}; fi
.include <bsd.prog.mk>
diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile
index ace0696a683..962df73ee38 100644
--- a/usr.bin/true/Makefile
+++ b/usr.bin/true/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:36 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:55 millert Exp $
MAN= true.1
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${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 ef47fa72f8e..a98e44aaa2c 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:37 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:56 millert Exp $
PROG= units
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${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 ff8460d09c2..2af2aa68595 100644
--- a/usr.bin/vgrind/Makefile
+++ b/usr.bin/vgrind/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:37 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:57 millert 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} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/vgrind.sh ${DESTDIR}/usr/bin/vgrind
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/vgrindefs.src ${DESTDIR}/usr/share/misc/vgrindefs
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
vgrindefs.src.db ${DESTDIR}/usr/share/misc/vgrindefs.db
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${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 4642e0fceb2..309e6133b1d 100644
--- a/usr.bin/vim/Makefile
+++ b/usr.bin/vim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 1997/01/31 18:11:01 kstailey Exp $
+# $OpenBSD: Makefile,v 1.8 1997/04/27 20:56:58 millert Exp $
.PATH: ${.CURDIR}/doc
@@ -50,7 +50,7 @@ afterinstall:
${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} ${COPY} -m 444 -o ${BINOWN} -g ${BINGRP} $$i \
+ ${INSTALL} ${INSTALL_COPY} -m 444 -o ${BINOWN} -g ${BINGRP} $$i \
${DESTDIR}/usr/share/vim; done
.include <bsd.prog.mk>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 9d5159f8c48..47f5baf4f5e 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:40 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:59 millert 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} \
- ${PROG} ${DESTDIR}${BINDIR}/install
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_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 445a57f8358..59f1b431107 100644
--- a/usr.bin/xlint/llib/Makefile
+++ b/usr.bin/xlint/llib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:40 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:56:59 millert 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} ${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 7e6cfff794a..47e53bd9439 100644
--- a/usr.bin/xlint/xlint/Makefile
+++ b/usr.bin/xlint/xlint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:32:41 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:57:00 millert Exp $
# $NetBSD: Makefile,v 1.2 1995/07/03 21:25:14 cgd Exp $
.PATH: ${.CURDIR}/../lint1
@@ -10,8 +10,8 @@ MAN= lint.1
CFLAGS+=-I${.CURDIR}/../lint1
realinstall:
- ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
- ${PROG} ${DESTDIR}${BINDIR}/lint
+ ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} \
+ -m ${BINMODE} ${PROG} ${DESTDIR}${BINDIR}/lint
.include "${.CURDIR}/../../Makefile.inc"
diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile
index efe5286eb54..618d1c95742 100644
--- a/usr.sbin/adduser/Makefile
+++ b/usr.sbin/adduser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1996/12/08 14:59:56 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:57:01 millert Exp $
# $From: Makefile,v 1.9 1996/11/17 03:51:26 wosch Exp $
SCRIPTS= adduser.perl rmuser.perl rmgroup.sh
@@ -6,7 +6,7 @@ MAN= adduser.8 adduser_proc.8 rmuser.8 rmgroup.8
beforeinstall:
.for script in ${SCRIPTS}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/${script} ${DESTDIR}${BINDIR}/${script:R}
.endfor
diff --git a/usr.sbin/named/ndc/Makefile b/usr.sbin/named/ndc/Makefile
index 3e74b8b790b..2b02af67feb 100644
--- a/usr.sbin/named/ndc/Makefile
+++ b/usr.sbin/named/ndc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1996/12/08 14:59:59 downsj Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:57:02 millert Exp $
# $NetBSD: Makefile,v 1.1 1996/02/02 15:29:48 mrg Exp $
# from: $Id: Makefile,v 8.1 1994/12/15 06:23:47 vixie Exp
@@ -9,7 +9,7 @@ CLEANFILES+= ndc
MAN= ndc.8
realinstall: ndc
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
ndc ${DESTDIR}${BINDIR}/ndc
ndc: ndc.sh Makefile ${.CURDIR}/../Makefile.inc
diff --git a/usr.sbin/named/nslookup/Makefile b/usr.sbin/named/nslookup/Makefile
index caa4065f0d7..3ab1f833a16 100644
--- a/usr.sbin/named/nslookup/Makefile
+++ b/usr.sbin/named/nslookup/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 1997/03/12 10:42:45 downsj Exp $
+# $OpenBSD: Makefile,v 1.4 1997/04/27 20:57:03 millert Exp $
# $NetBSD: Makefile,v 1.1 1996/02/02 15:29:56 mrg Exp $
# from: $Id: Makefile,v 8.1 1994/12/15 06:23:48 vixie Exp
@@ -14,7 +14,7 @@ CLEANFILES+= commands.c lex.yy.c lex.yy.o
MAN= nslookup.8
beforeinstall:
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/../nslookup/nslookup.help \
${DESTDIR}/usr/share/misc/nslookup.help
diff --git a/usr.sbin/named/reload/Makefile b/usr.sbin/named/reload/Makefile
index 9a589225198..e5abf92c84b 100644
--- a/usr.sbin/named/reload/Makefile
+++ b/usr.sbin/named/reload/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1996/12/08 15:00:02 downsj Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:57:04 millert Exp $
# $NetBSD: Makefile,v 1.1 1996/02/02 15:30:32 mrg Exp $
# from: $Id: Makefile,v 8.1 1994/12/15 06:23:46 vixie Exp
@@ -9,7 +9,7 @@ CLEANFILES+= named.reload
MAN= named.reload.8
realinstall: named.reload
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
named.reload ${DESTDIR}${BINDIR}/named.reload
named.reload: named.reload.sh Makefile ${.CURDIR}/../Makefile.inc
diff --git a/usr.sbin/named/restart/Makefile b/usr.sbin/named/restart/Makefile
index d09d89295ef..923e907d486 100644
--- a/usr.sbin/named/restart/Makefile
+++ b/usr.sbin/named/restart/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 1996/12/08 15:00:03 downsj Exp $
+# $OpenBSD: Makefile,v 1.6 1997/04/27 20:57:05 millert Exp $
# $NetBSD: Makefile,v 1.1 1996/02/02 15:30:35 mrg Exp $
# from: $Id: Makefile,v 8.1 1994/12/15 06:23:47 vixie Exp
@@ -9,7 +9,7 @@ CLEANFILES+= named.restart
MAN= named.restart.8
realinstall: named.restart
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
named.restart ${DESTDIR}${BINDIR}/named.restart
named.restart: named.restart.sh Makefile ${.CURDIR}/../Makefile.inc
diff --git a/usr.sbin/sendmail/cf/cf/Makefile b/usr.sbin/sendmail/cf/cf/Makefile
index d0eebebb49f..36741a806ac 100644
--- a/usr.sbin/sendmail/cf/cf/Makefile
+++ b/usr.sbin/sendmail/cf/cf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 1997/04/20 07:28:59 tholo Exp $
+# $OpenBSD: Makefile,v 1.10 1997/04/27 20:57:06 millert Exp $
# @(#)Makefile 8.19 (Berkeley) 1/14/97
#
@@ -35,7 +35,7 @@ clean cleandir:
depend install:
distribution:
- ${INSTALL} ${COPY} -o root -g wheel -m 444 openbsd-proto.cf \
+ ${INSTALL} ${INSTALL_COPY} -o root -g wheel -m 444 openbsd-proto.cf \
${DESTDIR}/etc/sendmail.cf
# this is overkill, but....
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
index 8bd8558e44b..ef6ede574c0 100644
--- a/usr.sbin/sendmail/src/Makefile
+++ b/usr.sbin/sendmail/src/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 1997/04/21 03:39:19 millert Exp $
+# $OpenBSD: Makefile,v 1.13 1997/04/27 20:57:06 millert Exp $
#
# OpenBSD Makefile
#
@@ -37,11 +37,11 @@ BINGRP= bin
BINMODE=4555
beforeinstall:
-# ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+# ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
# ${DESTDIR}/etc/sendmail.fc
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/log/sendmail.st
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/sendmail.hf ${DESTDIR}/usr/share/misc
.include "../../Makefile.inc"
diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile
index e3a2bb64981..659a2357db3 100644
--- a/usr.sbin/sliplogin/Makefile
+++ b/usr.sbin/sliplogin/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.1 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.2 1996/12/08 22:31:39 tholo Exp $
+# $Id: Makefile,v 1.3 1997/04/27 20:57:07 millert Exp $
PROG= sliplogin
MAN= sliplogin.8
@@ -13,7 +13,7 @@ afterinstall:
@echo installing ${FILES}
@-for i in ${FILES}; do \
if [ ! -f ${DESTDIR}/etc/sliphome/$$i ]; then \
- ${INSTALL} ${COPY} -o root -g wheel ${.CURDIR}/$$i \
+ ${INSTALL} ${INSTALL_COPY} -o root -g wheel ${.CURDIR}/$$i \
${DESTDIR}/etc/sliphome/$$i; \
fi; \
done
diff --git a/usr.sbin/ypserv/ypinit/Makefile b/usr.sbin/ypserv/ypinit/Makefile
index 3cc4469d106..81eb800d435 100644
--- a/usr.sbin/ypserv/ypinit/Makefile
+++ b/usr.sbin/ypserv/ypinit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 1997/04/24 18:30:30 deraadt Exp $
+# $OpenBSD: Makefile,v 1.13 1997/04/27 20:57:08 millert Exp $
MAN= ypinit.8
@@ -7,19 +7,19 @@ SHFILES= ypinit.sh
install:
.for script in ${SHFILES}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
${.CURDIR}/${script} ${DESTDIR}${BINDIR}/${script:R}
.endfor
.for script in ${DISTFILES}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
${.CURDIR}/${script} ${DESTDIR}/var/yp/${script}.dist
.endfor
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
${.CURDIR}/README ${DESTDIR}/var/yp/README
distribution:
.for script in ${DISTFILES}
- ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
+ ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
${.CURDIR}/${script} ${DESTDIR}/var/yp/${script}
.endfor