From 015a0dc2e45141f57d3f8e49d3eb2e56b56ce5b0 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Wed, 1 Jan 1997 04:22:23 +0000 Subject: [PATCH] Use ${COPY} instead of -c for installing non-source files. --- games/phantasia/Makefile | 16 ++++++++-------- gnu/usr.bin/bison/data/Makefile | 4 ++-- gnu/usr.bin/cvs/contrib/Makefile | 4 ++-- gnu/usr.bin/cvs/cvsbug/Makefile | 4 ++-- gnu/usr.bin/groff/eqn/Makefile | 2 +- gnu/usr.bin/groff/tmac/Makefile | 6 +++--- gnu/usr.bin/send-pr/Makefile | 2 +- share/syscons/scrnmaps/Makefile | 2 +- share/tabset/Makefile | 2 +- usr.bin/vgrind/Makefile | 2 +- usr.bin/vi/Makefile | 4 ++-- usr.sbin/named.reload/Makefile | 6 +++--- usr.sbin/named.restart/Makefile | 6 +++--- usr.sbin/ndc/Makefile | 4 ++-- usr.sbin/pcvt/fonts/Makefile | 3 +-- usr.sbin/stallion/bootcode/Makefile | 5 ++--- 16 files changed, 35 insertions(+), 37 deletions(-) diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile index 8e6ecccc10fb..1565566dd003 100644 --- a/games/phantasia/Makefile +++ b/games/phantasia/Makefile @@ -16,14 +16,14 @@ setup: phantglobs.o setup.o monsters.asc ${LIBM} beforeinstall: ./setup -m ${.CURDIR}/monsters.asc - ${INSTALL} -c -m 660 -o games -g bin gold ${DESTDIR}/var/games/phantasia - ${INSTALL} -c -m 660 -o games -g bin lastdead ${DESTDIR}/var/games/phantasia - ${INSTALL} -c -m 660 -o games -g bin mess ${DESTDIR}/var/games/phantasia - ${INSTALL} -c -m 660 -o games -g bin monsters ${DESTDIR}/var/games/phantasia - ${INSTALL} -c -m 660 -o games -g bin motd ${DESTDIR}/var/games/phantasia - ${INSTALL} -c -m 660 -o games -g bin characs ${DESTDIR}/var/games/phantasia - ${INSTALL} -c -m 660 -o games -g bin scoreboard ${DESTDIR}/var/games/phantasia - ${INSTALL} -c -m 660 -o games -g bin void ${DESTDIR}/var/games/phantasia + ${INSTALL} ${COPY} -m 660 -o games -g bin gold ${DESTDIR}/var/games/phantasia + ${INSTALL} ${COPY} -m 660 -o games -g bin lastdead ${DESTDIR}/var/games/phantasia + ${INSTALL} ${COPY} -m 660 -o games -g bin mess ${DESTDIR}/var/games/phantasia + ${INSTALL} ${COPY} -m 660 -o games -g bin monsters ${DESTDIR}/var/games/phantasia + ${INSTALL} ${COPY} -m 660 -o games -g bin motd ${DESTDIR}/var/games/phantasia + ${INSTALL} ${COPY} -m 660 -o games -g bin characs ${DESTDIR}/var/games/phantasia + ${INSTALL} ${COPY} -m 660 -o games -g bin scoreboard ${DESTDIR}/var/games/phantasia + ${INSTALL} ${COPY} -m 660 -o games -g bin void ${DESTDIR}/var/games/phantasia # Make Phantasia map. Change the map commands reflect your ${INSTALL}ation. # PLOTDEVICE is used for plotting the map. Change as appropriate. diff --git a/gnu/usr.bin/bison/data/Makefile b/gnu/usr.bin/bison/data/Makefile index 781844125c0c..e19574012958 100644 --- a/gnu/usr.bin/bison/data/Makefile +++ b/gnu/usr.bin/bison/data/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1996/09/10 13:23:44 peter Exp $ +# $Id: Makefile,v 1.2 1996/10/27 21:50:59 joerg Exp $ BISONDIR=${.CURDIR}/../../../../contrib/bison @@ -15,7 +15,7 @@ bison.s1: bison.simple < ${BISONDIR}/bison.simple > bison.s1 install: - ${INSTALL} -c -o bin -g bin -m 444 bison.s1 \ + ${INSTALL} ${COPY} -o bin -g bin -m 444 bison.s1 \ ${DESTDIR}${DATADIR}/bison.simple ${INSTALL} -c -o bin -g bin -m 444 ${BISONDIR}/bison.hairy \ ${DESTDIR}${DATADIR} diff --git a/gnu/usr.bin/cvs/contrib/Makefile b/gnu/usr.bin/cvs/contrib/Makefile index 0c3a79c2bfb9..a6a8db022381 100644 --- a/gnu/usr.bin/cvs/contrib/Makefile +++ b/gnu/usr.bin/cvs/contrib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.5 1996/08/20 23:53:00 peter Exp $ +# $Id: Makefile,v 1.6 1996/09/05 08:43:50 peter Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -31,7 +31,7 @@ all: ${SCRIPTS} beforeinstall: .for file in ${SCRIPTS} - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${file} ${DESTDIR}${EXAMPDIR}/contrib .endfor .for file in ${FILES} diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile index dea1d637c18c..0222324927f5 100644 --- a/gnu/usr.bin/cvs/cvsbug/Makefile +++ b/gnu/usr.bin/cvs/cvsbug/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.3 1995/12/11 04:24:06 peter Exp $ +# $Id: Makefile,v 1.4 1996/08/20 23:55:14 peter Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -22,7 +22,7 @@ all: cvsbug beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ cvsbug ${DESTDIR}${BINDIR}/cvsbug .include diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile index 1de1e4ce4cc4..9eaf49728748 100644 --- a/gnu/usr.bin/groff/eqn/Makefile +++ b/gnu/usr.bin/groff/eqn/Makefile @@ -15,7 +15,7 @@ neqn: sed -e 's/@g@/${g}/g' ${DIST_DIR}/neqn.sh > neqn afterinstall: neqn - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} neqn \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} neqn \ ${DESTDIR}${BINDIR} beforedepend: eqn.cc diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index 836ec6307b69..09a09c8aa8f8 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -26,18 +26,18 @@ beforeinstall: ${DIST_DIR}/$$f ${DESTDIR}${TMACDIR}; \ done sed -f ${DIST_DIR}/strip.sed ${DIST_DIR}/tmac.an >tmac.groff_an - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ tmac.groff_an ${DESTDIR}${TMACDIR} for f in ${STRIPFILES}; do \ rm -f temp; \ sed -f ${DIST_DIR}/strip.sed ${DIST_DIR}/$$f >temp; \ - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ temp ${DESTDIR}${TMACDIR}/$$f; \ done for f in ${MDOCFILES}; do \ rm -f temp; \ sed -f ${DIST_DIR}/strip.sed ${DIST_DIR}/$$f >temp; \ - ${INSTALL} -c -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ temp ${DESTDIR}${MDOCDIR}/$$f; \ done test -f ${DESTDIR}${TMACDIR}/man.local || \ diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile index c2b19a6cd77f..842d65cc2c70 100644 --- a/gnu/usr.bin/send-pr/Makefile +++ b/gnu/usr.bin/send-pr/Makefile @@ -28,7 +28,7 @@ send-pr.el: send-pr-el.in Makefile ${.ALLSRC:N*Makefile} > ${.TARGET} beforeinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ send-pr ${DESTDIR}${BINDIR}/send-pr # called from /usr/src/etc/Makefile diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile index 1c81d192bd33..c02fe1806bc6 100644 --- a/share/syscons/scrnmaps/Makefile +++ b/share/syscons/scrnmaps/Makefile @@ -9,7 +9,7 @@ NOMAN = noman all: ${SCRMAPS} install: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SCRMAPS} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${SCRMAPS} \ ${DESTDIR}${SCRDIR} ${SCRMAPS}: ${.TARGET:R}.mk diff --git a/share/tabset/Makefile b/share/tabset/Makefile index 7c08094b6871..faf7c9f069bb 100644 --- a/share/tabset/Makefile +++ b/share/tabset/Makefile @@ -14,7 +14,7 @@ ${FILES}: depend lint tags: install: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${FILES} \ ${DESTDIR}${BINDIR}/tabset .include diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile index ea692f65e790..b34e49669e9f 100644 --- a/usr.bin/vgrind/Makefile +++ b/usr.bin/vgrind/Makefile @@ -18,7 +18,7 @@ beforeinstall: ${.CURDIR}/vgrind.sh ${DESTDIR}/usr/bin/vgrind ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/vgrindefs.src \ ${DESTDIR}/usr/share/misc/vgrindefs - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ vgrindefs.src.db ${DESTDIR}/usr/share/misc/vgrindefs.db ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/tmac.vgrind \ ${DESTDIR}/usr/share/tmac diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index 3df71d1ff6d7..1eea427aa330 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -1,5 +1,5 @@ # -# $Id: Makefile,v 1.10 1996/12/08 14:05:08 ache Exp $ +# $Id: Makefile,v 1.11 1996/12/30 09:24:19 peter Exp $ # # This has most of the glue needed to compile tknvi and the perl hooks, # but not all. @@ -191,7 +191,7 @@ afterinstall: ${SRCDIR}/perl_scripts/*.pl \ ${DESTDIR}/usr/share/vi/perl .if defined(PERLINTERP) - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 VI.pm \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 VI.pm \ ${DESTDIR}/usr/share/vi/perl .endif diff --git a/usr.sbin/named.reload/Makefile b/usr.sbin/named.reload/Makefile index ec98433d55c5..d5e516ed0916 100644 --- a/usr.sbin/named.reload/Makefile +++ b/usr.sbin/named.reload/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1996/08/29 21:47:33 peter Exp $ .include "${.CURDIR}/../named/Makefile.inc" @@ -11,8 +11,8 @@ CLEANFILES+= named.reload all: named.reload realinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} named.reload \ - ${DESTDIR}${BINDIR} + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + named.reload ${DESTDIR}${BINDIR} named.reload: named.reload.sh ${BIND_DIR}/Makefile sed -e "s|%INDOT%|${INDOT}|" \ diff --git a/usr.sbin/named.restart/Makefile b/usr.sbin/named.restart/Makefile index cf15a9f6e84c..3eac6f495c49 100644 --- a/usr.sbin/named.restart/Makefile +++ b/usr.sbin/named.restart/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1996/08/29 21:48:19 peter Exp $ .include "${.CURDIR}/../named/Makefile.inc" @@ -11,8 +11,8 @@ CLEANFILES+= named.restart all: named.restart realinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} named.restart \ - ${DESTDIR}${BINDIR} + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + named.restart ${DESTDIR}${BINDIR} named.restart: named.restart.sh ${BIND_DIR}/Makefile sed -e "s|%INDOT%|${INDOT}|" \ diff --git a/usr.sbin/ndc/Makefile b/usr.sbin/ndc/Makefile index abb3e3d24c66..9a95bd23cd1b 100644 --- a/usr.sbin/ndc/Makefile +++ b/usr.sbin/ndc/Makefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: Makefile,v 1.1 1996/08/29 21:46:45 peter Exp $ .include "${.CURDIR}/../named/Makefile.inc" @@ -11,7 +11,7 @@ CLEANFILES+= ndc all: ndc realinstall: - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ndc \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ndc \ ${DESTDIR}${BINDIR} ndc: ndc.sh ndcedit.awk ${BIND_DIR}/Makefile diff --git a/usr.sbin/pcvt/fonts/Makefile b/usr.sbin/pcvt/fonts/Makefile index 6dedcb5312cb..9d9bf5028b4c 100644 --- a/usr.sbin/pcvt/fonts/Makefile +++ b/usr.sbin/pcvt/fonts/Makefile @@ -1,4 +1,3 @@ - .if !exists(${.CURDIR}/../Makefile.inc) error: @echo @@ -27,7 +26,7 @@ install: ${FONTS} @if [ ! -d ${DESTDIR}${FONTDIR} ]; then mkdir ${DESTDIR}${FONTDIR};fi @for i in ${FONTS}; do \ ${ECHO} "installing font $$i into ${DESTDIR}${FONTDIR}"; \ - ${INSTALL} -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ + ${INSTALL} ${COPY} -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ $$i ${DESTDIR}${FONTDIR}; \ done diff --git a/usr.sbin/stallion/bootcode/Makefile b/usr.sbin/stallion/bootcode/Makefile index 35f3c8fdc1a7..0c8d7af930ba 100644 --- a/usr.sbin/stallion/bootcode/Makefile +++ b/usr.sbin/stallion/bootcode/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1996/05/04 08:02:10 peter Exp $ +# $Id: Makefile,v 1.2 1996/05/05 07:40:46 peter Exp $ FILES = 2681.sys cdk.sys @@ -13,7 +13,7 @@ install: @if [ ! -d ${DESTDIR}${BOOTDIR} ]; then mkdir ${DESTDIR}${BOOTDIR};fi @for i in ${FILES}; do \ ${ECHO} "installing $$i into ${DESTDIR}${BOOTDIR}"; \ - ${INSTALL} -c -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ + ${INSTALL} ${COPY} -m ${LIBMODE} -o ${LIBOWN} -g ${LIBGRP} \ $$i ${DESTDIR}${BOOTDIR}; \ done @@ -29,4 +29,3 @@ cdk.sys: ${.CURDIR}/cdk.sys.uu 2681.sys: ${.CURDIR}/2681.sys.uu @rm -f $@ uudecode ${.CURDIR}/$@.uu -