From a8adf98c8204f370670e5624e9e11b497b7c97e8 Mon Sep 17 00:00:00 2001 From: ru 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 --- share/colldef/Makefile | 2 +- share/examples/Makefile | 2 +- share/examples/isdn/i4brunppp/Makefile | 2 +- share/info/Makefile | 2 +- share/mk/bsd.doc.mk | 4 ++-- share/mk/bsd.files.mk | 6 +++--- share/mk/bsd.info.mk | 4 ++-- share/mk/bsd.lib.mk | 6 +++--- share/mk/bsd.man.mk | 2 +- share/mk/bsd.own.mk | 8 -------- share/mk/bsd.prog.mk | 6 +++--- share/mklocale/Makefile | 2 +- share/monetdef/Makefile | 2 +- share/msgdef/Makefile | 2 +- share/numericdef/Makefile | 2 +- share/sendmail/Makefile | 2 +- share/skel/Makefile | 4 ++-- share/syscons/fonts/Makefile | 2 +- share/syscons/keymaps/Makefile | 2 +- share/syscons/scrnmaps/Makefile | 2 +- share/timedef/Makefile | 2 +- share/zoneinfo/Makefile | 2 +- 22 files changed, 30 insertions(+), 38 deletions(-) (limited to 'share') 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 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 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 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 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 -- cgit v1.1