* automake.in (handle_dist_worker): Exit if `cp' fails. Fixes

	install2.test.

diff --git a/ChangeLog b/ChangeLog
index ed7753656d61c79157435f59d451b9b493a94677..3df9473d02587dec3aa6706bbe7e0d789b719f63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-19  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_dist_worker): Exit if `cp' fails.  Fixes
+       install2.test.
+
        * tags.am: Don't reference $$here.  Report from Sven Verdoolaege.
 
 2000-03-13  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>

diff --git a/automake.in b/automake.in
index 223c721c2750eb7efd8ef90db086f69ce297ebe3..cbd46f445daa6846a94b22f53791f38a801bd3b9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2663,10 +2663,12 @@ sub handle_dist_worker
                      # 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    cp -pR \$\$d/\$\$file \$(distdir) \\\n"
+                     . "\t    || exit 1; \\\n"
                      . "\t  else \\\n"
                      . "\t    test -f \$(distdir)/\$\$file \\\n"
-                     . "\t    || cp -p \$\$d/\$\$file \$(distdir)/\$\$file || :; \\\n"
+                     . "\t    || cp -p \$\$d/\$\$file \$(distdir)/\$\$file \\\n"
+                     . "\t    || exit 1; \\\n"
                      . "\t  fi; \\\n"
                      . "\tdone\n");