summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-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
26 files changed, 67 insertions, 67 deletions
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"