From a8adf98c8204f370670e5624e9e11b497b7c97e8 Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Mon, 29 Jul 2002 09:40:17 +0000
Subject: Drop support for COPY, -c has been the default mode of install(1) for
 a long time now.

Approved by:	bde
---
 usr.bin/calendar/Makefile      | 4 ++--
 usr.bin/doscmd/Makefile        | 8 ++++----
 usr.bin/locate/locate/Makefile | 2 +-
 usr.bin/mail/Makefile          | 2 +-
 usr.bin/strip/Makefile         | 2 +-
 usr.bin/vi/Makefile            | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile
index 32670b9b..07f0428 100644
--- a/usr.bin/calendar/Makefile
+++ b/usr.bin/calendar/Makefile
@@ -11,11 +11,11 @@ HR_LINKS=       hr_HR.ISO_8859-2
 TEXTMODE?=	444
 
 beforeinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
+	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
 	    ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar
 .for lang in ${INTER}
 	mkdir -p ${DESTDIR}${SHAREDIR}/calendar/${lang}
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
+	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
 		${.CURDIR}/calendars/${lang}/calendar.* \
 		${DESTDIR}${SHAREDIR}/calendar/${lang} 
 .endfor
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index 72ad5bc..5a46a83 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -38,15 +38,15 @@ CFLAGS+=	-DNO_X
 
 beforeinstall:
 .if ${OBJFORMAT} == "aout"
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
+	${INSTALL} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
 	    doscmd.kernel ${DESTDIR}/usr/libexec/
 .endif
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
+	${INSTALL} -o ${BINOWN} -g ${EXEGRP} -m ${EXEMODE} \
 	    emsdriv.sys redir.com ${DESTDIR}/usr/libdata/doscmd/
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${SHAREMODE} \
+	${INSTALL} -o ${BINOWN} -g ${EXEGRP} -m ${SHAREMODE} \
 	    ${FONTFILES} ${DESTDIR}/usr/libdata/doscmd/fonts
 	cd ${.CURDIR} && \
-	    ${INSTALL} ${COPY} -o ${BINOWN} -g ${EXEGRP} -m ${SHAREMODE} \
+	    ${INSTALL} -o ${BINOWN} -g ${EXEGRP} -m ${SHAREMODE} \
 		fonts.dir ${DESTDIR}/usr/libdata/doscmd/fonts
 
 .if ${OBJFORMAT} == "aout"
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 5ddb9f1..9a618da 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -14,7 +14,7 @@ SCRIPTSNAME_${script}=	locate.${script:R}
 MLINKS+= locate.updatedb.8 updatedb.8
 
 # only /usr/src/etc/Makefile install files in /etc
-#	${INSTALL} ${COPY} -o root -g wheel -m 644 \
+#	${INSTALL} -o root -g wheel -m 644 \
 #		${.CURDIR}/locate.rc ${DESTDIR}/etc
 
 .include "../../Makefile.inc"
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 6891c77..491d06f 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -14,7 +14,7 @@ MLINKS=	mail.1 Mail.1 mail.1 mailx.1
 .PATH: ${.CURDIR}/misc
 
 etc-mailrc:
-	cd ${.CURDIR}/misc; ${INSTALL} ${COPY} -o root -g wheel \
+	cd ${.CURDIR}/misc; ${INSTALL} -o root -g wheel \
 	    -m 644 ${EFILES} ${DESTDIR}/etc
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/strip/Makefile b/usr.bin/strip/Makefile
index ff8384f..204ef7c 100644
--- a/usr.bin/strip/Makefile
+++ b/usr.bin/strip/Makefile
@@ -17,7 +17,7 @@ maybe_stripped: strip
 .endif
 
 realinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    maybe_stripped ${DESTDIR}${BINDIR}/strip
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index 43df74d..170e89d 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -83,7 +83,7 @@ ex_noperl.c: ex_perl.c
 CLEANFILES+=	ex_notcl.c ex_noperl.c
 
 afterinstall:
-	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${CATALOGS:S;^;${SRCDIR}/catalog/;} \
 		${DESTDIR}/usr/share/vi/catalog
 	for l in ${NLLINKS}; do \
-- 
cgit v1.1