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

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 

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

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

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 */