From: Tom Tromey <tromey@redhat.com>
Date: Sun, 19 Mar 2000 20:37:06 +0000 (+0000)
Subject: 	* automake.in (handle_dist_worker): Exit if `cp' fails.  Fixes
X-Git-Tag: Release-1-4b~115
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=fecf28375bca6fc2a0cedc5e462ba54345f1b8b0;p=automake.git

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

diff --git a/ChangeLog b/ChangeLog
index ed775365..3df9473d 100644
--- 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 223c721c..cbd46f44 100755
--- 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");