diff options
| author | ru <ru@FreeBSD.org> | 2002-07-29 08:51:04 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-07-29 08:51:04 +0000 |
| commit | 2a8927efce725d1d177ca030f8748dd047f9a198 (patch) | |
| tree | 54788dca6e7876d3ef897a3112a9627753ada68e | |
| parent | 72f02df3c8671ae3e4970d5bf744548dc5e74a8a (diff) | |
| download | FreeBSD-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
| -rw-r--r-- | UPDATING | 6 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 2 | ||||
| -rw-r--r-- | share/man/man5/make.conf.5 | 2 | ||||
| -rw-r--r-- | usr.bin/xinstall/xinstall.c | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT 5.0-CURRENT IS SLOW: integrity. Re-enabling write caching can substantially improve performance. +20020729: + COPY is being deprecated. The 20010530 change was reverted, as + it causes far more pain than was expected, and to always compare + before installing, please use INSTALL="install -C" again. The + -C option is now silently ignored when used with the -d option. + 20020702: Problems with libc_r clients like KDE and GNOME have been resolved. There are still some minor problems with some signals but the 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 diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index feddb74..1313e0b 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -173,7 +173,7 @@ main(argc, argv) argv += optind; /* some options make no sense when creating directories */ - if ((safecopy || docompare || dostrip) && dodir) + if (dostrip && dodir) usage(); /* must have at least two arguments, except when creating directories */ |
