From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Sun, 6 Jun 1999 21:32:04 +0000 (+0000)
Subject: * automake.in (handle_dist): Change emitted rules so that a failure
X-Git-Tag: merging-into-user-dep-gen~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90d54ffbd9c3a36d3a3a51f2c5a44d203fb03a8f;p=thirdparty%2Fautomake.git

* automake.in (handle_dist): Change emitted rules so that a failure
in `$(MAKE) distcheck-hook' propagates to the outer make.
---

diff --git a/ChangeLog b/ChangeLog
index 422267736..ae6c66caa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-07  Jim Meyering  <meyering@ascend.com>
+
+	* automake.in (handle_dist): Change emitted rules so that a failure
+	in `$(MAKE) distcheck-hook' propagates to the outer make.
+
 1999-05-27  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (handle_single_transform_list): Replace AM_FLAG and
diff --git a/automake.in b/automake.in
index 6b34b93c4..80ed96d7f 100755
--- a/automake.in
+++ b/automake.in
@@ -2869,13 +2869,13 @@ distcheck: dist
 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
 	mkdir $(distdir)/=build
 	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \\'
+	dc_install_base=`cd $(distdir)/=inst && pwd` \\'
 			  . (&target_defined ('distcheck-hook')
-			     ? ("\n\t\$(MAKE) \$(AM_MAKEFLAGS)"
-				. " distcheck-hook; \\")
+			     ? ("\n\t  && \$(MAKE) \$(AM_MAKEFLAGS)"
+				. " distcheck-hook \\")
 			     : '')
 			  . '
-	cd $(distdir)/=build \\
+	  && cd $(distdir)/=build \\
 	  && ../configure '
 
 			  . ($seen_gettext ? '--with-included-gettext ' : '')