4 files changed, 9 insertions, 3 deletions

diff --git a/UPDATING b/UPDATING
index 9925d9856e96..3ed7f19b9135 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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 af72a0121a72..54ff68713699 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 633e531668c3..d6211d73685f 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 feddb7452fa6..1313e0b3bf57 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 */