From 83119130104f0fb80a0e54bd70c434a91971dccc Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 9 Nov 1999 05:47:37 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 ++++++ THANKS | 1 + automake.in | 6 +++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 70f64df76..734c6fdeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-11-08 Tom Tromey + + * 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 * texinfos.am (uninstall-info): Use installed info file, not one diff --git a/THANKS b/THANKS index 2f668ccf7..cd585463b 100644 --- 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 11074bef9..f5cc3752b 100755 --- 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" -- 2.47.2