diff options
79 files changed, 155 insertions, 163 deletions
diff --git a/etc/Makefile b/etc/Makefile index 7d5dd18..8f7e389 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -63,20 +63,20 @@ distribute: .if defined(OBJFORMAT) echo OBJFORMAT=${OBJFORMAT} > ${DISTDIR}/${DISTRIBUTION}/etc/objformat .endif - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ ${DISTDIR}/${DISTRIBUTION}/boot/device.hints distribution: cd ${.CURDIR}; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${BIN2} ${DESTDIR}/etc; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd - cd ${.CURDIR}/defaults; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${DEFAULTS} ${DESTDIR}/etc/defaults cd ${.CURDIR}/periodic; ${MAKE} install cd ${.CURDIR}/rc.d; ${MAKE} install @@ -92,73 +92,73 @@ distribution: .endif .if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL) .if !defined(NO_OPENSSH) - cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSH} ${DESTDIR}/etc/ssh .endif - cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSL} ${DESTDIR}/etc/ssl .endif .if !defined(NO_MAKEDEV_INSTALL) - cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 555 \ + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \ MAKEDEV.local MAKEDEV ${DESTDIR}/dev .if !defined(NO_MAKEDEV_RUN) cd ${DESTDIR}/dev; sh MAKEDEV all .endif .endif cd ${.CURDIR}/root; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.klogin ${DESTDIR}/root/.klogin; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.profile ${DESTDIR}/root/.profile; \ rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \ ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile - cd ${.CURDIR}/mtree; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree - cd ${.CURDIR}/namedb; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${NAMEDB} ${DESTDIR}/etc/namedb - cd ${.CURDIR}/ppp; ${INSTALL} ${COPY} -o root -g ${BINGRP} -m 600 \ + cd ${.CURDIR}/ppp; ${INSTALL} -o root -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp - cd ${.CURDIR}/mail; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${ETCMAIL} ${DESTDIR}/etc/mail @if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ ! -f ${DESTDIR}/etc/aliases ]; then \ set -x; \ ln -s mail/aliases ${DESTDIR}/etc/aliases; \ fi - ${INSTALL} ${COPY} -o ${BINOWN} -g operator -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \ ${DESTDIR}/etc/dumpdates - ${INSTALL} ${COPY} -o nobody -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/db/locate.database - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/auth.log - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/cron - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/lpd-errs - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ ${DESTDIR}/var/log/maillog - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/lastlog - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/messages - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/security - ${INSTALL} ${COPY} -o ${BINOWN} -g network -m 640 /dev/null \ + ${INSTALL} -o ${BINOWN} -g network -m 640 /dev/null \ ${DESTDIR}/var/log/slip.log - ${INSTALL} ${COPY} -o ${BINOWN} -g network -m 640 /dev/null \ + ${INSTALL} -o ${BINOWN} -g network -m 640 /dev/null \ ${DESTDIR}/var/log/ppp.log - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/wtmp - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/run/utmp - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \ ${DESTDIR}/var/crash - cd ${.CURDIR}/..; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${FREEBSD} ${DESTDIR}/ .if !defined(NOMAN) cd ${.CURDIR}/../share/man; ${MAKE} makedb @@ -214,10 +214,10 @@ distrib-dirs: done etc-examples: - cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}/usr/share/examples/etc - cd ${.CURDIR}/defaults; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${DEFAULTS} ${DESTDIR}/usr/share/examples/etc/defaults .include <bsd.prog.mk> diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile index f4d0222..74d36ea 100644 --- a/etc/isdn/Makefile +++ b/etc/isdn/Makefile @@ -18,10 +18,10 @@ I4BETCFILE= holidays.D \ install: for i in ${I4BETCPROG} ; do \ - ${INSTALL} ${COPY} -o root -g wheel -m 700 $$i ${DESTDIR}/etc/isdn ; \ + ${INSTALL} -o root -g wheel -m 700 $$i ${DESTDIR}/etc/isdn ; \ done ; \ for i in ${I4BETCFILE} ; do \ - ${INSTALL} ${COPY} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ + ${INSTALL} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ done # Suck in the ${COPY} definition. diff --git a/etc/mail/Makefile b/etc/mail/Makefile index 51afb8a..e4323b6 100644 --- a/etc/mail/Makefile +++ b/etc/mail/Makefile @@ -187,7 +187,7 @@ install: install-cf install-submit-cf install-cf: ${INSTALL_CF} .if ${INSTALL_CF} != /etc/mail/sendmail.cf - ${INSTALL} ${COPY} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf + ${INSTALL} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf .endif @@ -199,7 +199,7 @@ install-submit-cf: ${INSTALL_SUBMIT_CF} @false .else .if ${INSTALL_SUBMIT_CF} != /etc/mail/submit.cf - ${INSTALL} ${COPY} -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf + ${INSTALL} -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf .endif .endif diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index 58abfbf..ca4443c 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -80,18 +80,18 @@ install: ${INSTALL_CF} ${INSTALL_SUBMIT_CF} .endif .if defined(INSTALL_CF) .if ${INSTALL_CF} != ${DEST_CF} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \ ${DEST_CF} .endif .endif .if defined(SENDMAIL_ADDITIONAL_CF) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail .endif .ifndef SENDMAIL_SET_USER_ID .if defined(INSTALL_SUBMIT_CF) .if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF} .endif .endif @@ -103,37 +103,37 @@ distribution: freebsd.cf freebsd.mc ${INSTALL_CF} ${INSTALL_SUBMIT_CF} @echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set" @false .endif - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \ ${DESTDIR}/etc/mail/freebsd.mc - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ ${DESTDIR}/etc/mail/freebsd.cf .if defined(INSTALL_CF) .if ${INSTALL_CF} != ${DEST_CF} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \ ${DEST_CF} .endif .else - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ ${DEST_CF} .endif - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \ ${DESTDIR}/etc/mail/freebsd.submit.mc - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ ${DESTDIR}/etc/mail/freebsd.submit.cf .ifndef SENDMAIL_SET_USER_ID .if defined(INSTALL_SUBMIT_CF) .if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF} .endif .else - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ ${DEST_SUBMIT_CF} .endif .endif - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \ ${DESTDIR}/etc/mail/helpfile - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ ${DESTDIR}/var/log/sendmail.st .include <bsd.prog.mk> diff --git a/games/battlestar/Makefile b/games/battlestar/Makefile index fc73db9..d4f8631 100644 --- a/games/battlestar/Makefile +++ b/games/battlestar/Makefile @@ -13,7 +13,7 @@ HIDEGAME=hidegame beforeinstall: .if !exists(${DESTDIR}/var/games/battlestar.log) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/battlestar.log .endif diff --git a/games/canfield/canfield/Makefile b/games/canfield/canfield/Makefile index eeff961..421bb7c 100644 --- a/games/canfield/canfield/Makefile +++ b/games/canfield/canfield/Makefile @@ -10,7 +10,7 @@ MLINKS= canfield.6 cfscores.6 beforeinstall: .if !exists(${DESTDIR}/var/games/cfscores) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/cfscores .endif diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile index dbffc7b..5faeccd 100644 --- a/games/cribbage/Makefile +++ b/games/cribbage/Makefile @@ -12,7 +12,7 @@ HIDEGAME=hidegame beforeinstall: .if !exists(${DESTDIR}/var/games/criblog) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/criblog .endif diff --git a/games/hack/Makefile b/games/hack/Makefile index b00f50f..eaf19e5 100644 --- a/games/hack/Makefile +++ b/games/hack/Makefile @@ -34,10 +34,10 @@ makedefs: makedefs.o ${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} /dev/null \ ${DESTDIR}/var/games/hackdir/perm .if !exists(${DESTDIR}/var/games/hackdir/record) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 460 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 460 /dev/null \ ${DESTDIR}/var/games/hackdir/record .endif # rm -f ${DESTDIR}/var/games/hackdir/bones* \ diff --git a/games/larn/Makefile b/games/larn/Makefile index d31c969..b74886f 100644 --- a/games/larn/Makefile +++ b/games/larn/Makefile @@ -68,11 +68,11 @@ HIDEGAME=hidegame beforeinstall: .if !exists(${DESTDIR}/var/games/larn/lscore12.0) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ ${DESTDIR}/var/games/larn/lscore12.0 .endif .if !exists(${DESTDIR}/var/games/larn/llog12.0) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ ${DESTDIR}/var/games/larn/llog12.0 .endif diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile index 4d1b992..8c79652 100644 --- a/games/phantasia/Makefile +++ b/games/phantasia/Makefile @@ -27,7 +27,7 @@ setup: cross-phantglobs.o setup.o ${LIBM} beforeinstall: .for file in ${DATAFILES} .if !exists(${DESTDIR}/var/games/phantasia/${file}) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 660 \ ${file} ${DESTDIR}/var/games/phantasia .endif .endfor diff --git a/games/robots/Makefile b/games/robots/Makefile index dd0fa39..3e26d85 100644 --- a/games/robots/Makefile +++ b/games/robots/Makefile @@ -12,7 +12,7 @@ HIDEGAME=hidegame beforeinstall: .if !exists(${DESTDIR}/var/games/robots_roll) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/robots_roll .endif diff --git a/games/rogue/Makefile b/games/rogue/Makefile index 01f4582..7e3eea9 100644 --- a/games/rogue/Makefile +++ b/games/rogue/Makefile @@ -13,7 +13,7 @@ MAN= rogue.6 beforeinstall: .if !exists(${DESTDIR}/var/games/rogue.scores) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/rogue.scores .endif diff --git a/games/sail/Makefile b/games/sail/Makefile index 216d699..1a2a278 100644 --- a/games/sail/Makefile +++ b/games/sail/Makefile @@ -12,7 +12,7 @@ HIDEGAME=hidegame beforeinstall: .if !exists(${DESTDIR}/var/games/saillog) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/saillog .endif diff --git a/games/snake/snake/Makefile b/games/snake/snake/Makefile index ada4032..68b82e8 100644 --- a/games/snake/snake/Makefile +++ b/games/snake/snake/Makefile @@ -11,11 +11,11 @@ MLINKS= snake.6 snscore.6 beforeinstall: .if !exists(${DESTDIR}/var/games/snakerawscores) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/snakerawscores .endif .if !exists(${DESTDIR}/var/games/snake.log) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/snake.log .endif diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile index b65c195..780e7fd 100644 --- a/gnu/lib/csu/Makefile +++ b/gnu/lib/csu/Makefile @@ -61,7 +61,7 @@ tconfig.h: ${CCDIR}/cc_tools/Makefile realinstall: .for file in ${OBJS} ${SOBJS} ${TGTOBJS} - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/} .endfor diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile index 856b777..d2b9e94 100644 --- a/gnu/lib/libdialog/Makefile +++ b/gnu/lib/libdialog/Makefile @@ -24,7 +24,7 @@ DPADD+= ${LIBNCURSES} .if !defined(NOHTML) afterinstall: .for file in ${EXAMPLES} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/TESTS/${file} ${DESTDIR}/usr/share/examples/libdialog .endfor .endif diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile index 38e31ee..a2fc8cb 100644 --- a/gnu/usr.bin/binutils/ld/Makefile +++ b/gnu/usr.bin/binutils/ld/Makefile @@ -52,7 +52,7 @@ stringify.sed: ln -sf ${SRCDIR}/ld/emultempl/astring.sed ${.TARGET} afterinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${LDSCRIPTS:S|^|ldscripts/|} ${DESTDIR}${SCRIPTDIR} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/binutils/strip/Makefile b/gnu/usr.bin/binutils/strip/Makefile index 4dc10c2..c059b4b 100644 --- a/gnu/usr.bin/binutils/strip/Makefile +++ b/gnu/usr.bin/binutils/strip/Makefile @@ -26,7 +26,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/gnu/usr.bin/groff/contrib/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile index 13686f0..63911be 100644 --- a/gnu/usr.bin/groff/contrib/mm/Makefile +++ b/gnu/usr.bin/groff/contrib/mm/Makefile @@ -24,7 +24,7 @@ CLEANFILES+= ${MAN} beforeinstall: .for locale in ${LOCALE} .if !exists(${DESTDIR}${TMACDIR}/mm/${locale}) - ${INSTALL} ${COPY} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ + ${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ /dev/null ${DESTDIR}${TMACDIR}/mm/${locale} .endif .endfor diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev index e3066ca..a485d1c 100644 --- a/gnu/usr.bin/groff/font/Makefile.dev +++ b/gnu/usr.bin/groff/font/Makefile.dev @@ -5,7 +5,7 @@ DEVICEDIR?= ${fontdir}/dev${DEV} all: ${DEVFILES} beforeinstall: ${DEVFILES} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.ALLSRC} ${DESTDIR}${DEVICEDIR} .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile index 3a5c786..67970af 100644 --- a/gnu/usr.bin/groff/src/utils/indxbib/Makefile +++ b/gnu/usr.bin/groff/src/utils/indxbib/Makefile @@ -7,7 +7,7 @@ LDADD= ${LIBBIB} ${LIBGROFF} -lm CLEANFILES= ${MAN} beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict/ .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index d7da734..95966ab 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -53,22 +53,22 @@ $f-s: $f beforeinstall: cd ${DIST_DIR}; \ - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ ${NORMALFILES} ${DESTDIR}${TMACDIR} cd ${.CURDIR}; \ - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ hyphen.us-ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} .for f in ${STRIPFILES} ${SPECIALFILES} - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${TMACDIR}/$f .endfor .for f in ${MDOCFILES} - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${MDOCDIR}/$f .endfor .if !exists(${DESTDIR}${TMACDIR}/man.local) - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ ${DIST_DIR}/man.local ${DESTDIR}${TMACDIR} .endif diff --git a/gnu/usr.bin/rcs/rcsfreeze/Makefile b/gnu/usr.bin/rcs/rcsfreeze/Makefile index b59217b..6b5c348 100644 --- a/gnu/usr.bin/rcs/rcsfreeze/Makefile +++ b/gnu/usr.bin/rcs/rcsfreeze/Makefile @@ -3,7 +3,7 @@ MAN= rcsfreeze.1 afterinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/rcsfreeze.sh ${DESTDIR}${BINDIR}/rcsfreeze .include "../../Makefile.inc" diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile index 1f698b1..c48eff6 100644 --- a/gnu/usr.bin/send-pr/Makefile +++ b/gnu/usr.bin/send-pr/Makefile @@ -29,7 +29,7 @@ send-pr.el: send-pr-el.in Makefile # called from /usr/src/etc/Makefile etc-gnats-freefall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 0644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0644 \ ${.CURDIR}/categories ${DESTDIR}/etc/gnats/freefall .include <bsd.prog.mk> diff --git a/kerberosIV/share/info/Makefile b/kerberosIV/share/info/Makefile index 1fa5c02..3b8c374 100644 --- a/kerberosIV/share/info/Makefile +++ b/kerberosIV/share/info/Makefile @@ -6,10 +6,10 @@ NOOBJ= noobj all clean cleandir depend lint tags: beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ ${DESTDIR}${BINDIR}/info/dir-tmpl if [ ! -f ${DESTDIR}${BINDIR}/info/dir ]; then \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ ${DESTDIR}${BINDIR}/info/dir ; \ fi diff --git a/lib/compat/compat1x/Makefile b/lib/compat/compat1x/Makefile index 07be405..4d68d74 100644 --- a/lib/compat/compat1x/Makefile +++ b/lib/compat/compat1x/Makefile @@ -20,7 +20,7 @@ ${lib}: ${lib}.gz.uu .endfor beforeinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ ${DESTDIR}${LIBCOMPATDIR}/aout # Get all the fruit, even though we don't set PROG. diff --git a/lib/compat/compat20/Makefile b/lib/compat/compat20/Makefile index f416b33..8d7dc6b 100644 --- a/lib/compat/compat20/Makefile +++ b/lib/compat/compat20/Makefile @@ -15,9 +15,9 @@ ${lib}: ${lib}.gz.uu .endfor beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \ ${DESTDIR}/usr/libexec - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ ${DESTDIR}${LIBCOMPATDIR}/aout # Get all the fruit, even though we don't set PROG. diff --git a/lib/compat/compat21/Makefile b/lib/compat/compat21/Makefile index 652bbb7..08c41cb 100644 --- a/lib/compat/compat21/Makefile +++ b/lib/compat/compat21/Makefile @@ -14,9 +14,9 @@ ${lib}: ${lib}.gz.uu .endfor beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \ ${DESTDIR}/usr/libexec - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ ${DESTDIR}${LIBCOMPATDIR}/aout # Get all the fruit, even though we don't set PROG. diff --git a/lib/compat/compat22/Makefile b/lib/compat/compat22/Makefile index 94457f3..6b21cbf 100644 --- a/lib/compat/compat22/Makefile +++ b/lib/compat/compat22/Makefile @@ -22,9 +22,9 @@ ${lib}: ${lib}.gz.uu .endfor beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \ ${DESTDIR}/usr/libexec - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ ${DESTDIR}${LIBCOMPATDIR}/aout @${ECHO} "libcrypt.so.2.0 -> libscrypt.so.2.0" ; \ cd ${DESTDIR}${LIBCOMPATDIR}/aout ; \ diff --git a/lib/compat/compat3x.i386/Makefile b/lib/compat/compat3x.i386/Makefile index 43280bf..c709d78 100644 --- a/lib/compat/compat3x.i386/Makefile +++ b/lib/compat/compat3x.i386/Makefile @@ -18,7 +18,7 @@ ${lib}: ${lib}.gz.uu .endfor beforeinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ ${DESTDIR}${LIBCOMPATDIR} # Get all the fruit, even though we don't set PROG. diff --git a/lib/compat/compat4x.alpha/Makefile b/lib/compat/compat4x.alpha/Makefile index a71445f..1bc95ad 100644 --- a/lib/compat/compat4x.alpha/Makefile +++ b/lib/compat/compat4x.alpha/Makefile @@ -38,7 +38,7 @@ ${lib}: ${.CURDIR}/${lib}.bz2.uu .endfor beforeinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ ${DESTDIR}${LIBCOMPATDIR} # Get all the fruit, even though we don't set PROG. diff --git a/lib/compat/compat4x.i386/Makefile b/lib/compat/compat4x.i386/Makefile index a71445f..1bc95ad 100644 --- a/lib/compat/compat4x.i386/Makefile +++ b/lib/compat/compat4x.i386/Makefile @@ -38,7 +38,7 @@ ${lib}: ${.CURDIR}/${lib}.bz2.uu .endfor beforeinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ ${DESTDIR}${LIBCOMPATDIR} # Get all the fruit, even though we don't set PROG. diff --git a/lib/csu/alpha/Makefile b/lib/csu/alpha/Makefile index fd9f545..8b81815 100644 --- a/lib/csu/alpha/Makefile +++ b/lib/csu/alpha/Makefile @@ -15,7 +15,7 @@ gcrt1.o: crt1.c ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC} realinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${OBJS} ${DESTDIR}${LIBDIR} .include <bsd.lib.mk> diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile index a780693..c5b902a 100644 --- a/lib/csu/amd64/Makefile +++ b/lib/csu/amd64/Makefile @@ -18,7 +18,7 @@ gcrt1.o: crt1.c ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c realinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${OBJS} ${DESTDIR}${LIBDIR} .include <bsd.lib.mk> diff --git a/lib/csu/i386-elf/Makefile b/lib/csu/i386-elf/Makefile index a780693..c5b902a 100644 --- a/lib/csu/i386-elf/Makefile +++ b/lib/csu/i386-elf/Makefile @@ -18,7 +18,7 @@ gcrt1.o: crt1.c ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c realinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${OBJS} ${DESTDIR}${LIBDIR} .include <bsd.lib.mk> diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile index b3be808..219f3c6 100644 --- a/lib/csu/i386/Makefile +++ b/lib/csu/i386/Makefile @@ -41,7 +41,7 @@ sgcrt0.o: scrt0.o @mv ${.TARGET}.tmp ${.TARGET} realinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${OBJS} \ ${DESTDIR}${LIBDIR} depend: .depend diff --git a/lib/csu/ia64/Makefile b/lib/csu/ia64/Makefile index 46c0277..23954e8 100644 --- a/lib/csu/ia64/Makefile +++ b/lib/csu/ia64/Makefile @@ -17,7 +17,7 @@ gcrt1.o: crt1.c ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC} realinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${OBJS} ${DESTDIR}${LIBDIR} .include <bsd.lib.mk> diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile index 46c0277..23954e8 100644 --- a/lib/csu/powerpc/Makefile +++ b/lib/csu/powerpc/Makefile @@ -17,7 +17,7 @@ gcrt1.o: crt1.c ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC} realinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${OBJS} ${DESTDIR}${LIBDIR} .include <bsd.lib.mk> diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile index 3d1904c..2e1d03f 100644 --- a/lib/csu/sparc64/Makefile +++ b/lib/csu/sparc64/Makefile @@ -15,7 +15,7 @@ gcrt1.o: crt1.c ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC} realinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${OBJS} ${DESTDIR}${LIBDIR} .include <bsd.lib.mk> diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index fd76152..92611f6 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -268,7 +268,7 @@ DOCS= ncurses-intro.html hackguide.html afterinstall: .for file in ${DOCS} cd ${.CURDIR}/../../contrib/ncurses/doc/html ; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ ${DESTDIR}${DOCSDIR} .endfor .endif diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index fd76152..92611f6 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -268,7 +268,7 @@ DOCS= ncurses-intro.html hackguide.html afterinstall: .for file in ${DOCS} cd ${.CURDIR}/../../contrib/ncurses/doc/html ; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ ${DESTDIR}${DOCSDIR} .endfor .endif diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile index caa9098..d49e76c 100644 --- a/sbin/mount_msdosfs/Makefile +++ b/sbin/mount_msdosfs/Makefile @@ -19,7 +19,7 @@ TABLES= iso22dos iso72dos koi2dos koi8u2dos afterinstall: cd ${.CURDIR} && \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ ${TABLES} ${TABDIR} .include <bsd.prog.mk> diff --git a/share/colldef/Makefile b/share/colldef/Makefile index fa2beb2..118aa30 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -78,7 +78,7 @@ uk_UA.KOI8-U.out: map.KOI8-U afterinstall: .for locale in ${LOCALES} - ${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} \ + ${INSTALL} -m 644 -o ${BINOWN} -g ${BINGRP} \ ${locale}.out ${LOCALEDIR}/${locale}/LC_COLLATE .endfor .for link in ${ASCIILINKS} diff --git a/share/examples/Makefile b/share/examples/Makefile index 442e0b7..72ea6bf 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -269,7 +269,7 @@ copies: mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \ -f ${.CURDIR}/../../etc/mtree/BSD.usr.dist -p ${DESTDIR}/usr .for file in ${XFILES} - ${INSTALL} ${COPY} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ + ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} \ ${.CURDIR}/${file} ${DESTDIR}${BINDIR}/${file} .endfor diff --git a/share/examples/isdn/i4brunppp/Makefile b/share/examples/isdn/i4brunppp/Makefile index c530da6..d18a6a4 100644 --- a/share/examples/isdn/i4brunppp/Makefile +++ b/share/examples/isdn/i4brunppp/Makefile @@ -13,7 +13,7 @@ install: @echo user-ppp in dial-in server under i4b, please copy it into /etc/isdn. installetc: i4brunppp - ${INSTALL} ${COPY} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \ + ${INSTALL} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \ ${.CURDIR}/i4brunppp ${RUNPPPDEST} .include <bsd.prog.mk> diff --git a/share/info/Makefile b/share/info/Makefile index d144d48..2f19ee8 100644 --- a/share/info/Makefile +++ b/share/info/Makefile @@ -17,6 +17,6 @@ beforeinstall: @exit 3; .endif .if !exists(${DESTDIR}${INFODIR}/dir) - ${INSTALL} ${COPY} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ + ${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ dir-tmpl ${DESTDIR}${INFODIR}/dir .endif diff --git a/share/mk/bsd.doc.mk b/share/mk/bsd.doc.mk index e64c8d8..f15f33a 100644 --- a/share/mk/bsd.doc.mk +++ b/share/mk/bsd.doc.mk @@ -103,10 +103,10 @@ CLEANFILES+= ${DOC}.ascii ${DOC}.ascii${DCOMPRESS_EXT} \ realinstall: .if ${PRINTERDEVICE} == "html" cd ${SRCDIR}; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${DOC}*.html ${DESTDIR}${BINDIR}/${VOLUME} .else - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${DFILE} ${DESTDIR}${BINDIR}/${VOLUME} .endif diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk index b4159ac..bf3a5df 100644 --- a/share/mk/bsd.files.mk +++ b/share/mk/bsd.files.mk @@ -39,7 +39,7 @@ ${group}NAME_${file:T}?= ${file:T} .endif installfiles: _${group}INS_${file:T} _${group}INS_${file:T}: ${file} - ${INSTALL} ${COPY} -o ${${group}OWN_${.ALLSRC:T}} \ + ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ ${.ALLSRC} \ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} @@ -51,11 +51,11 @@ _${group}FILES+= ${file} installfiles: _${group}INS _${group}INS: ${_${group}FILES} .if defined(${group}NAME) - ${INSTALL} ${COPY} -o ${${group}OWN} -g ${${group}GRP} \ + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ -m ${${group}MODE} ${.ALLSRC} \ ${DESTDIR}${${group}DIR}/${${group}NAME} .else - ${INSTALL} ${COPY} -o ${${group}OWN} -g ${${group}GRP} \ + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \ -m ${${group}MODE} ${.ALLSRC} ${DESTDIR}${${group}DIR} .endif .endif diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk index 0f6f49d..5d7733d 100644 --- a/share/mk/bsd.info.mk +++ b/share/mk/bsd.info.mk @@ -174,11 +174,11 @@ CLEANFILES+= ${INFO:S/$/.info.*.html/} ${INFO:S/$/.info/} .if !defined(NOINFO) && defined(INFO) install: ${INSTALLINFODIRS} .if ${IFILES:N*.html} - ${INSTALL} ${COPY} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ + ${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ ${IFILES:N*.html} ${DESTDIR}${INFODIR} .endif .if ${FORMATS:Mhtml} - ${INSTALL} ${COPY} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ + ${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ ${INFO:S/$/.info.*.html/} ${DESTDIR}${INFODIR} .endif .else diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index f750fed..6ff36d9 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -282,7 +282,7 @@ _libinstall: ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} .endif .if defined(SHLIB_NAME) - ${INSTALL} ${COPY} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} .if defined(SHLIB_LINK) @@ -290,11 +290,11 @@ _libinstall: .endif .endif .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} .endif .if defined(WANT_LINT) && defined(LIB) && !empty(LIB) - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} .endif .endif !defined(INTERNALLIB) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 1752d00..479a5ee 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -53,7 +53,7 @@ .error bsd.man.mk cannot be included directly. .endif -MINSTALL= ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} +MINSTALL= ${INSTALL} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} CATDIR= ${MANDIR:H:S/$/\/cat/} CATEXT= .cat diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 6d80dfe..bab9a51 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -11,13 +11,6 @@ # DISTDIR Change the tree where the file for a distribution # gets installed (see /usr/src/release/Makefile). [not set] # -# -# COPY The flag passed to the install program to cause the binary -# to be copied rather than moved. This is to be used when -# building our own install script so that the entire system -# can either be installed with copies, or with moves using -# a single knob. [-c] -# # COMPRESS_CMD Program to compress documents. # Output is to stdout. [gzip -cn] # @@ -177,7 +170,6 @@ INCLUDEDIR?= /usr/include STRIP?= -s .endif -COPY?= -c COMPRESS_CMD?= gzip -cn COMPRESS_EXT?= .gz diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 696faca..5cfc877 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -106,10 +106,10 @@ realinstall: _proginstall _proginstall: .if defined(PROG) .if defined(PROGNAME) - ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}/${PROGNAME} .else - ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR} .endif .endif @@ -140,7 +140,7 @@ SCRIPTSGRP_${script:T}?= ${SCRIPTSGRP} SCRIPTSMODE_${script:T}?= ${SCRIPTSMODE} _scriptsinstall: _SCRIPTSINS_${script:T} _SCRIPTSINS_${script:T}: ${script} - ${INSTALL} ${COPY} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ + ${INSTALL} -o ${SCRIPTSOWN_${.ALLSRC:T}} \ -g ${SCRIPTSGRP_${.ALLSRC:T}} -m ${SCRIPTSMODE_${.ALLSRC:T}} \ ${.ALLSRC} \ ${DESTDIR}${SCRIPTSDIR_${.ALLSRC:T}}/${SCRIPTSNAME_${.ALLSRC:T}} diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile index 37fb967..517edef 100644 --- a/share/mklocale/Makefile +++ b/share/mklocale/Makefile @@ -42,7 +42,7 @@ all: ${LOCALES:S/$/.out/g} afterinstall: .for locale in ${LOCALES} - ${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} \ + ${INSTALL} -m 644 -o ${BINOWN} -g ${BINGRP} \ ${locale}.out ${LOCALEDIR}/${locale}/LC_CTYPE .endfor .for link in ${LATIN1LINKS} diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile index b9bc763..9a03fb0 100644 --- a/share/monetdef/Makefile +++ b/share/monetdef/Makefile @@ -67,7 +67,7 @@ all: ${LOCALES:S/$/.out/g} afterinstall: .for lang in ${LOCALES} - ${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \ + ${INSTALL} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \ ${LOCALEDIR}/${lang}/LC_MONETARY .endfor .for link in ${LATIN15LINKS} diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index 18164f6..96ffb3d 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -67,7 +67,7 @@ afterinstall: # HACK: remove LC_MESSAGES directories before installing LC_MESSAGES file -rm -rf ${LOCALEDIR}/*/LC_MESSAGES .for lang in ${LOCALES} - ${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \ + ${INSTALL} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \ ${LOCALEDIR}/${lang}/LC_MESSAGES .endfor .for link in ${LATIN15LINKS} diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile index 550ba44..2c38ea8 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -63,7 +63,7 @@ all: ${LOCALES:S/$/.out/g} afterinstall: .for lang in ${LOCALES} - ${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \ + ${INSTALL} -m 644 -o ${BINOWN} -g ${BINGRP} ${lang}.out \ ${LOCALEDIR}/${lang}/LC_NUMERIC .endfor .for link in ${LATIN15LINKS} diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile index 274e4b1..6b28991 100644 --- a/share/sendmail/Makefile +++ b/share/sendmail/Makefile @@ -26,7 +26,7 @@ copies:: ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 -d ${DDIR}/${dir} .endfor .for file in ${CFFILES} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file} + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file} .endfor symlinks:: diff --git a/share/skel/Makefile b/share/skel/Makefile index dbd3a00..aff9bb7 100644 --- a/share/skel/Makefile +++ b/share/skel/Makefile @@ -11,9 +11,9 @@ NOOBJ= noobj all clean cleandir depend lint tags: install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${MODE1} ${FILES1} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${MODE1} ${FILES1} \ ${DESTDIR}${BINDIR}/skel - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${MODE2} ${FILES2} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${MODE2} ${FILES2} \ ${DESTDIR}${BINDIR}/skel .include <bsd.prog.mk> diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index 0680c32..774b0f5 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -33,7 +33,7 @@ NOMAN = noman NOOBJ = noobj install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FONTS} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FONTS} \ ${DESTDIR}${FONTDIR} .include <bsd.prog.mk> diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index c5f98fc..1268499 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -44,7 +44,7 @@ NOMAN = noman NOOBJ = noobj install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${KEYMAPS} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${KEYMAPS} \ ${DESTDIR}${MAPSDIR} .include <bsd.prog.mk> diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile index 4a49ccc..ef1d044 100644 --- a/share/syscons/scrnmaps/Makefile +++ b/share/syscons/scrnmaps/Makefile @@ -16,7 +16,7 @@ all: ${SCRMAPS} build-tools: ${SCRMAPS_MK} install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ ${SCRMAPS} ${DESTDIR}${SCRDIR} ${SCRMAPS}: ${.TARGET:R}.mk diff --git a/share/timedef/Makefile b/share/timedef/Makefile index 3c2e5c3..767691f 100644 --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -64,7 +64,7 @@ all: ${LOCALES:S/$/.out/g} afterinstall: for l in ${LOCALES}; do \ - ${INSTALL} ${COPY} -m 644 -o ${BINOWN} -g ${BINGRP} $$l.out \ + ${INSTALL} -m 644 -o ${BINOWN} -g ${BINGRP} $$l.out \ ${LOCALEDIR}/$$l/LC_TIME; \ done for l in ${LATIN15LINKS}; do \ diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index fc7666c..bd7ea0b 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -33,7 +33,7 @@ beforeinstall: zic -D -d ${DESTDIR}/usr/share/zoneinfo -p ${POSIXRULES} \ -u ${BINOWN} -g ${BINGRP} \ ${LEAPFILE} -y ${YEARISTYPE} ${TZFILES} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ .include <bsd.prog.mk> diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index 2883b93..05cf5b0 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -86,9 +86,9 @@ sio.o: sio.s ${.IMPSRC} -o ${.TARGET} install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot1 ${DESTDIR}${BINDIR}/boot1 - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot2 ${DESTDIR}${BINDIR}/boot2 .include <bsd.prog.mk> diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index 2883b93..05cf5b0 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -86,9 +86,9 @@ sio.o: sio.s ${.IMPSRC} -o ${.TARGET} install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot1 ${DESTDIR}${BINDIR}/boot1 - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot2 ${DESTDIR}${BINDIR}/boot2 .include <bsd.prog.mk> diff --git a/sys/boot/pc98/boot2/Makefile b/sys/boot/pc98/boot2/Makefile index 6077a09..a9ce538 100644 --- a/sys/boot/pc98/boot2/Makefile +++ b/sys/boot/pc98/boot2/Makefile @@ -83,7 +83,7 @@ boot2: boot.nohdr all: boot1 boot2 install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot1 boot2 ${DESTDIR}${BINDIR} .include <bsd.kern.mk> diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 2c52b4d..ac331d3 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -157,17 +157,17 @@ kernel-install: .endif mkdir -p ${DESTDIR}${KODIR} .if defined(DEBUG) && defined(INSTALL_DEBUG) - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} .else - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .endif kernel-reinstall: @-chflags -R noschg ${DESTDIR}${KODIR} .if defined(DEBUG) && defined(INSTALL_DEBUG) - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} .else - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .endif .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules) diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 3138194..c27762c 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -205,11 +205,11 @@ realinstall: _kmodinstall .ORDER: beforeinstall _kmodinstall .if defined(DEBUG) && defined(INSTALL_DEBUG) _kmodinstall: - ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ + ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR} .else _kmodinstall: - ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ + ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR} .include <bsd.links.mk> 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 \ diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile index e599a19..1db3325 100644 --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -21,7 +21,7 @@ SYMLINKS+= /usr/libexec/sendmail/sendmail ${BINDIR}/mailwrapper afterinstall: .if !defined(NO_MAILWRAPPER) .if !exists(${DESTDIR}/etc/mail/mailer.conf) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${.CURDIR}/../../etc/mail/mailer.conf ${DESTDIR}/etc/mail .endif .endif diff --git a/usr.sbin/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile index 02b06ee..b4e4350 100644 --- a/usr.sbin/pcvt/keycap/Makefile +++ b/usr.sbin/pcvt/keycap/Makefile @@ -18,7 +18,7 @@ CFLAGS+= -DKEYCAP_PATH=\"$(CAPPATH)\" #CLEANFILES+= keycap.0 man5/keycap.0 beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.CURDIR}/${KEYCAPSRC} ${DESTDIR}${CAPPATH} .include <bsd.lib.mk> diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index 7d94b07..f4eeaa1 100644 --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -58,7 +58,7 @@ yppasswd_private_svc.c: yppasswd_private.x sed s/"static int _rpcsvcstate = _IDLE"/"extern int _rpcsvcstate"/g > ${.TARGET} afterinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/yppwupdate \ ${DESTDIR}/usr/libexec/yppwupdate diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile index 3c762c6..b86d0c2 100644 --- a/usr.sbin/ypserv/Makefile +++ b/usr.sbin/ypserv/Makefile @@ -31,10 +31,10 @@ yp.h: yp.x ${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/yp.x afterinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/Makefile.yp \ ${DESTDIR}/var/yp/Makefile.dist - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 555 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \ ${.CURDIR}/ypinit.sh ${DESTDIR}${BINDIR}/ypinit @if [ ! -f ${DESTDIR}/var/yp/Makefile.dist ]; then \ ln -s ${DESTDIR}/var/yp/Makefile.dist \ |
