summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2002-07-29 08:51:04 +0000
committerru <ru@FreeBSD.org>2002-07-29 08:51:04 +0000
commit2a8927efce725d1d177ca030f8748dd047f9a198 (patch)
tree54788dca6e7876d3ef897a3112a9627753ada68e /share
parent72f02df3c8671ae3e4970d5bf744548dc5e74a8a (diff)
downloadFreeBSD-src-2a8927efce725d1d177ca030f8748dd047f9a198.zip
FreeBSD-src-2a8927efce725d1d177ca030f8748dd047f9a198.tar.gz
Ignore -C, -p, and -S options of install(1) when used with the -d
option. Warn about COPY being phased out. Restore the old method of always comparing before installing: INSTALL="install -C". Requested by: bde
Diffstat (limited to 'share')
-rw-r--r--share/examples/etc/make.conf2
-rw-r--r--share/man/man5/make.conf.52
2 files changed, 2 insertions, 2 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index af72a01..54ff687 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -74,7 +74,7 @@
#WANT_FORCE_OPTIMIZATION_DOWNGRADE=1
#
# Compare before install
-#COPY= -C
+#INSTALL=install -C
#
# Mtree will follow symlinks
#MTREE_FOLLOWS_SYMLINKS= -L
diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5
index 633e531..d6211d7 100644
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@@ -136,7 +136,7 @@ the default install command.
To have commands compared before doing
the install, use
.Bd -literal -offset indent
-COPY=-C
+INSTALL="install -C"
.Ed
.It Va LOCAL_DIRS
.Pq Vt str
OpenPOWER on IntegriCloud