* 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 4222677..ae6c66c 100644 (file)
--- 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 6b34b93..80ed96d 100755 (executable)
--- 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 ' : '')