* automake.in (handle_dist_worker): Use `cp -R', not `cp -r'.

	From Jim Meyering.  Also, don't mention file name in `cp'
	destination.  From Olly Betts.

diff --git a/ChangeLog b/ChangeLog
index 70f64df760d64ce7869ece1ca8647507ac11c3f0..734c6fdeb87650fe40bd7e228fbfea6e2f4f79cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-11-08  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_dist_worker): Use `cp -R', not `cp -r'.
+       From Jim Meyering.  Also, don't mention file name in `cp'
+       destination.  From Olly Betts.
+
 1999-10-27  Miodrag Vallat  <miodrag@ifrance.com>
 
        * texinfos.am (uninstall-info): Use installed info file, not one

diff --git a/THANKS b/THANKS
index 2f668ccf70bd884b1478a2c2a9a23a2a49c44ec4..cd585463b46902303e8b3aa4805731308bb85ae3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -83,6 +83,7 @@ Nelson H. F. Beebe    beebe@math.utah.edu
 Noah Friedman          friedman@gnu.ai.mit.edu
 Nyul Laszlo            nyul@sol.cc.u-szeged.hu
 OKUJI Yoshinori                okuji@kuicr.kyoto-u.ac.jp
+Olly Betts             olly@muscat.co.uk
 Paul Berrevoets                paul@swi.com
 Paul D. Smith          psmith@BayNetworks.COM
 Paul Eggert            eggert@twinsun.com

diff --git a/automake.in b/automake.in
index 11074bef9414660d107e453e71594a354beedcd5..f5cc3752bee923de15a8ee54712c7f99d123fd88 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2695,7 +2695,11 @@ sub handle_dist_worker
        $output_rules .= "\t  d=\$(srcdir); \\\n";
     }
     $output_rules .= ("\t  if test -d \$\$d/\$\$file; then \\\n"
-                     . "\t    cp -pr \$\$d/\$\$file \$(distdir)/\$\$file; \\\n"
+                     # Don't mention $$file in destination argument,
+                     # since this fails if destination directory
+                     # already exists.  Also, use `-R' and not `-r'.
+                     # `-r' is almost always incorrect.
+                     . "\t    cp -pR \$\$d/\$\$file \$(distdir); \\\n"
                      . "\t  else \\\n"
                      . "\t    test -f \$(distdir)/\$\$file \\\n"
                      . "\t    || ln \$\$d/\$\$file \$(distdir)/\$\$file 2> /dev/null \\\n"