diff options
author | ru <ru@FreeBSD.org> | 2002-07-29 09:40:17 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2002-07-29 09:40:17 +0000 |
commit | a8adf98c8204f370670e5624e9e11b497b7c97e8 (patch) | |
tree | 5612f3de1042a85c3a65ed7da6124c3d8da3d097 /share/mk | |
parent | 3a86ff2aeb2a498c6d51422bae381540233c6946 (diff) | |
download | FreeBSD-src-a8adf98c8204f370670e5624e9e11b497b7c97e8.zip FreeBSD-src-a8adf98c8204f370670e5624e9e11b497b7c97e8.tar.gz |
Drop support for COPY, -c has been the default mode of install(1)
for a long time now.
Approved by: bde
Diffstat (limited to 'share/mk')
-rw-r--r-- | share/mk/bsd.doc.mk | 4 | ||||
-rw-r--r-- | share/mk/bsd.files.mk | 6 | ||||
-rw-r--r-- | share/mk/bsd.info.mk | 4 | ||||
-rw-r--r-- | share/mk/bsd.lib.mk | 6 | ||||
-rw-r--r-- | share/mk/bsd.man.mk | 2 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 8 | ||||
-rw-r--r-- | share/mk/bsd.prog.mk | 6 |
7 files changed, 14 insertions, 22 deletions
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}} |