.

diff --git a/ChangeLog b/ChangeLog
index 943a7bf273bf44d09a4d0d01963a85dcea9afd9e..1ac76f44e30bdf89cb99683ea5c083c6daca18aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,33 @@
-2004-06-29  Jim Meyering  <jim@meyering.net>
+2004-06-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        * Version 5.3.0.
 
+       Add support for --no-target-directory option.
+
+       * NEWS: Document it.
+       * doc/coreutils.texi (Common options, Target directory, cp
+       invocation, install invocation, mv invocation, ln invocation):
+       Likewise.
+       (link invocation): Explain how to rewrite link using ln now
+       that we have --no-target-directory.
+       (ln invocation): Explain that --no-target-directory subsumes
+       --no-dereference.
+       (unlink invocation): Modify wording to match new wording in
+       link invocation.
+
+       * src/cp.c (NO_TARGET_DIRECTORY_OPTION): New constant.
+       (long_opts, usage, do_copy, main): Add support for
+       --no-target-directory,
+       * src/install.c (NO_TARGET_DIRECTORY_OPTION, long_options, main,
+       usage): Likewise.
+       * src/ln.c (NO_TARGET_DIRECTORY_OPTION, long_options, usage,
+       main): Likewise.
+       * src/mv.c (NO_TARGET_DIRECTORY_OPTION, long_options, usage,
+       main): Likewise.
+       * src/mv.c (enum): Sort values.
+
+2004-06-29  Jim Meyering  <jim@meyering.net>
+
        Don't let verbose-mode output from a subshell obscure actual differences.
        * tests/rm/inaccessible: Turn off command-echoing just before
        invoking subshell, then turn it back on if VERBOSE=yes afterward.

diff --git a/src/Makefile.in b/src/Makefile.in
index 3087831dd5730da8481790977e1b9bee8c0f9b46..8175052d85b196548625a8c90e61a20bf52f401c 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -933,7 +933,7 @@ uninstall-binPROGRAMS:
        done
 
 clean-binPROGRAMS:
-       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
        bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \