diff --git a/etc/Makefile b/etc/Makefile index e84853d072df..7d5dd186dd73 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -69,14 +69,14 @@ distribute: distribution: cd ${.CURDIR}; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${BIN2} ${DESTDIR}/etc; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 \ + ${INSTALL} ${COPY} -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} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/defaults; ${INSTALL} ${COPY} -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} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSH} ${DESTDIR}/etc/ssh .endif - cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSL} ${DESTDIR}/etc/ssl .endif .if !defined(NO_MAKEDEV_INSTALL) - cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \ + cd ${.CURDIR}; ${INSTALL} ${COPY} -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} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.klogin ${DESTDIR}/root/.klogin; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -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} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/mtree; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree - cd ${.CURDIR}/namedb; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/namedb; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${NAMEDB} ${DESTDIR}/etc/namedb - cd ${.CURDIR}/ppp; ${INSTALL} -c -o root -g ${BINGRP} -m 600 \ + cd ${.CURDIR}/ppp; ${INSTALL} ${COPY} -o root -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp - cd ${.CURDIR}/mail; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/mail; ${INSTALL} ${COPY} -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} -c -o ${BINOWN} -g operator -m 664 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g operator -m 664 /dev/null \ ${DESTDIR}/etc/dumpdates - ${INSTALL} -c -o nobody -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} ${COPY} -o nobody -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/db/locate.database - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/auth.log - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/cron - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/lpd-errs - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ ${DESTDIR}/var/log/maillog - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/lastlog - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/messages - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/security - ${INSTALL} -c -o ${BINOWN} -g network -m 640 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g network -m 640 /dev/null \ ${DESTDIR}/var/log/slip.log - ${INSTALL} -c -o ${BINOWN} -g network -m 640 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g network -m 640 /dev/null \ ${DESTDIR}/var/log/ppp.log - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/wtmp - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/run/utmp - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \ ${DESTDIR}/var/crash - cd ${.CURDIR}/..; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/..; ${INSTALL} ${COPY} -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} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}/usr/share/examples/etc - cd ${.CURDIR}/defaults; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/defaults; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${DEFAULTS} ${DESTDIR}/usr/share/examples/etc/defaults .include diff --git a/etc/isdn/Makefile b/etc/isdn/Makefile index ec787260aa29..35aad239b76a 100644 --- a/etc/isdn/Makefile +++ b/etc/isdn/Makefile @@ -18,9 +18,9 @@ I4BETCFILE= holidays.D \ install: for i in ${I4BETCPROG} ; do \ - ${INSTALL} -c -o root -g wheel -m 700 $$i ${DESTDIR}/etc/isdn ; \ + ${INSTALL} ${COPY} -o root -g wheel -m 700 $$i ${DESTDIR}/etc/isdn ; \ done ; \ for i in ${I4BETCFILE} ; do \ - ${INSTALL} -c -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ + ${INSTALL} ${COPY} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ done diff --git a/etc/mail/Makefile b/etc/mail/Makefile index 1212cf9d0fbd..51afb8a3e156 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} -c -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf + ${INSTALL} ${COPY} -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} -c -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf + ${INSTALL} ${COPY} -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf .endif .endif diff --git a/etc/periodic/Makefile.inc b/etc/periodic/Makefile.inc index aba831316adf..b3d98fb64b62 100644 --- a/etc/periodic/Makefile.inc +++ b/etc/periodic/Makefile.inc @@ -4,5 +4,5 @@ BINDIR= /etc/periodic/${.CURDIR:T} NOOBJ= beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 ${BIN} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 755 ${BIN} \ ${DESTDIR}${BINDIR} diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index 394d7b1498ca..58abfbf36879 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -116,9 +116,9 @@ distribution: freebsd.cf freebsd.mc ${INSTALL_CF} ${INSTALL_SUBMIT_CF} ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ ${DEST_CF} .endif - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \ ${DESTDIR}/etc/mail/freebsd.submit.mc - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ + ${INSTALL} ${COPY} -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) @@ -127,13 +127,13 @@ distribution: freebsd.cf freebsd.mc ${INSTALL_CF} ${INSTALL_SUBMIT_CF} ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF} .endif .else - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ ${DEST_SUBMIT_CF} .endif .endif - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \ ${DESTDIR}/etc/mail/helpfile - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ ${DESTDIR}/var/log/sendmail.st .include diff --git a/games/battlestar/Makefile b/games/battlestar/Makefile index a6be83c3c073..fc73db98ed82 100644 --- a/games/battlestar/Makefile +++ b/games/battlestar/Makefile @@ -13,7 +13,7 @@ HIDEGAME=hidegame beforeinstall: .if !exists(${DESTDIR}/var/games/battlestar.log) - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} ${COPY} -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 650e784eefb5..eeff9611109d 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} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/cfscores .endif diff --git a/games/cribbage/Makefile b/games/cribbage/Makefile index 53448a74d35d..dbffc7b053eb 100644 --- a/games/cribbage/Makefile +++ b/games/cribbage/Makefile @@ -12,7 +12,7 @@ HIDEGAME=hidegame beforeinstall: .if !exists(${DESTDIR}/var/games/criblog) - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/criblog .endif diff --git a/games/hack/Makefile b/games/hack/Makefile index ce503afd991e..b00f50fa2850 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} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} /dev/null \ ${DESTDIR}/var/games/hackdir/perm .if !exists(${DESTDIR}/var/games/hackdir/record) - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 460 /dev/null \ + ${INSTALL} ${COPY} -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 a15eba61e25a..d31c969ca283 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} -c -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ ${DESTDIR}/var/games/larn/lscore12.0 .endif .if !exists(${DESTDIR}/var/games/larn/llog12.0) - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ ${DESTDIR}/var/games/larn/llog12.0 .endif diff --git a/games/robots/Makefile b/games/robots/Makefile index 1c2ef0d329fc..dd0fa393e22f 100644 --- a/games/robots/Makefile +++ b/games/robots/Makefile @@ -12,7 +12,7 @@ HIDEGAME=hidegame beforeinstall: .if !exists(${DESTDIR}/var/games/robots_roll) - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} ${COPY} -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 95734e9f33f5..01f458237f18 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} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} ${COPY} -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 c921c83dd01d..216d69981657 100644 --- a/games/sail/Makefile +++ b/games/sail/Makefile @@ -12,7 +12,7 @@ HIDEGAME=hidegame beforeinstall: .if !exists(${DESTDIR}/var/games/saillog) - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} ${COPY} -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 597044d7237a..ada40326d99c 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} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/snakerawscores .endif .if !exists(${DESTDIR}/var/games/snake.log) - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/snake.log .endif diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile index 40d98b4d3c6e..856b7773f3df 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} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/TESTS/${file} ${DESTDIR}/usr/share/examples/libdialog .endfor .endif diff --git a/gnu/usr.bin/groff/contrib/mm/Makefile b/gnu/usr.bin/groff/contrib/mm/Makefile index 03568029767b..13686f0c4729 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} -c -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ + ${INSTALL} ${COPY} -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 85be29ab73bb..e3066cac010d 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} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.ALLSRC} ${DESTDIR}${DEVICEDIR} .include diff --git a/gnu/usr.bin/groff/src/utils/indxbib/Makefile b/gnu/usr.bin/groff/src/utils/indxbib/Makefile index eae694a2f755..3a5c786c3364 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} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict/ .include diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index c384ed3097e3..d7da734474cf 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -53,7 +53,7 @@ $f-s: $f beforeinstall: cd ${DIST_DIR}; \ - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ ${NORMALFILES} ${DESTDIR}${TMACDIR} cd ${.CURDIR}; \ ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ @@ -68,7 +68,7 @@ beforeinstall: $f-s ${DESTDIR}${MDOCDIR}/$f .endfor .if !exists(${DESTDIR}${TMACDIR}/man.local) - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} ${COPY} -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 c52f93e04fdb..b59217b55586 100644 --- a/gnu/usr.bin/rcs/rcsfreeze/Makefile +++ b/gnu/usr.bin/rcs/rcsfreeze/Makefile @@ -3,7 +3,7 @@ MAN= rcsfreeze.1 afterinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -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 55aa5e6c6625..1f698b1e0941 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} -c -o ${BINOWN} -g ${BINGRP} -m 0644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 0644 \ ${.CURDIR}/categories ${DESTDIR}/etc/gnats/freefall .include diff --git a/kerberosIV/share/info/Makefile b/kerberosIV/share/info/Makefile index 0360a58be245..1fa5c021d2f5 100644 --- a/kerberosIV/share/info/Makefile +++ b/kerberosIV/share/info/Makefile @@ -1,14 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 +# $FreeBSD$ NOOBJ= noobj all clean cleandir depend lint tags: beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ ${DESTDIR}${BINDIR}/info/dir-tmpl if [ ! -f ${DESTDIR}${BINDIR}/info/dir ]; then \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ ${DESTDIR}${BINDIR}/info/dir ; \ fi diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index 4de3c8a3643a..fd76152270c7 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} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ ${DESTDIR}${DOCSDIR} .endfor .endif diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index 4de3c8a3643a..fd76152270c7 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} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${file} \ ${DESTDIR}${DOCSDIR} .endfor .endif diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile index 25e0a21060b4..caa909804b64 100644 --- a/sbin/mount_msdosfs/Makefile +++ b/sbin/mount_msdosfs/Makefile @@ -19,7 +19,7 @@ TABLES= iso22dos iso72dos koi2dos koi8u2dos afterinstall: cd ${.CURDIR} && \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ ${TABLES} ${TABDIR} .include diff --git a/share/colldef/Makefile b/share/colldef/Makefile index 3dde203b8509..fa2beb20b665 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} -c -m 644 -o ${BINOWN} -g ${BINGRP} \ + ${INSTALL} ${COPY} -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 d2cd800dd59a..c0044f4089ee 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -26,7 +26,7 @@ beforeinstall: etc-examples ${SHARED} FILES!= find -L ${dir} \( -name CVS -prune \) -o -type f -print .for file in ${FILES} copies:: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${file} ${DDIR}/${file} + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${file} ${DDIR}/${file} .endfor .endfor diff --git a/share/examples/isdn/i4brunppp/Makefile b/share/examples/isdn/i4brunppp/Makefile index 80cde94d31e2..c530da6f95cf 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} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \ + ${INSTALL} ${COPY} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \ ${.CURDIR}/i4brunppp ${RUNPPPDEST} .include diff --git a/share/info/Makefile b/share/info/Makefile index 2a75fe44c835..d144d48c9793 100644 --- a/share/info/Makefile +++ b/share/info/Makefile @@ -17,6 +17,6 @@ beforeinstall: @exit 3; .endif .if !exists(${DESTDIR}${INFODIR}/dir) - ${INSTALL} -c -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ + ${INSTALL} ${COPY} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ dir-tmpl ${DESTDIR}${INFODIR}/dir .endif diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile index 23fefebc4b91..274e4b12e5de 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} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file} + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${SENDMAIL_DIR}/${file} ${DDIR}/${file} .endfor symlinks:: diff --git a/share/skel/Makefile b/share/skel/Makefile index cee9708df396..dbd3a004d908 100644 --- a/share/skel/Makefile +++ b/share/skel/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 +# $FreeBSD$ FILES1= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile dot.shrc FILES2= dot.mail_aliases dot.rhosts @@ -10,9 +11,9 @@ NOOBJ= noobj all clean cleandir depend lint tags: install: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${MODE1} ${FILES1} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${MODE1} ${FILES1} \ ${DESTDIR}${BINDIR}/skel - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${MODE2} ${FILES2} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${MODE2} ${FILES2} \ ${DESTDIR}${BINDIR}/skel .include diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index a9c133625d0b..0680c328a4ae 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -33,7 +33,7 @@ NOMAN = noman NOOBJ = noobj install: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FONTS} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${FONTS} \ ${DESTDIR}${FONTDIR} .include diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index 5099320683f4..c5f98fcb8358 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -44,7 +44,7 @@ NOMAN = noman NOOBJ = noobj install: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${KEYMAPS} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} ${KEYMAPS} \ ${DESTDIR}${MAPSDIR} .include diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 6ce6503d10ce..fc7666cf0d56 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} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/ .include diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index e09f40bf230d..32670b9b3a57 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} -c -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ ${.CURDIR}/calendars/calendar.* ${DESTDIR}${SHAREDIR}/calendar .for lang in ${INTER} mkdir -p ${DESTDIR}${SHAREDIR}/calendar/${lang} - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \ ${.CURDIR}/calendars/${lang}/calendar.* \ ${DESTDIR}${SHAREDIR}/calendar/${lang} .endfor diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile index 37058a0aae1b..5ddb9f163f76 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} -c -o root -g wheel -m 644 \ +# ${INSTALL} ${COPY} -o root -g wheel -m 644 \ # ${.CURDIR}/locate.rc ${DESTDIR}/etc .include "../../Makefile.inc" diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile index fb1d046f0291..6891c7728d72 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} -c -o root -g wheel \ + cd ${.CURDIR}/misc; ${INSTALL} ${COPY} -o root -g wheel \ -m 644 ${EFILES} ${DESTDIR}/etc .include diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index 9481bd8d33b3..43df74db9c6d 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} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} ${COPY} -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/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile index c85dba4ce8fc..02b06ee0da3e 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} -c -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.CURDIR}/${KEYCAPSRC} ${DESTDIR}${CAPPATH} .include diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index 871a57881f92..7d94b070a7e0 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} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -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 30c3f3f1109b..3c762c6dc58d 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} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/Makefile.yp \ ${DESTDIR}/var/yp/Makefile.dist - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \ + ${INSTALL} ${COPY} -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 \