maint: improve dist-check.mk rules
authorJim Meyering <meyering@redhat.com>
Mon, 14 Dec 2009 10:33:03 +0000 (11:33 +0100)
committerJim Meyering <meyering@redhat.com>
Mon, 14 Dec 2009 10:33:03 +0000 (11:33 +0100)
* dist-check.mk (null_AM_MAKEFLAGS): Remove LIBTOOL.  Adding it was
erroneous, since it is required when building from a distribution
tarball of a libtool-using project.  Reported by Ralf Wildenhues.
(my-distcheck): Reorganize to use a subshell and set -e, so that
failures propagate "out".  Without this change, setting LIBTOOL=false
would cause a failure that would then be ignored, probably due to a
problem in $(install-transform-check).

dist-check.mk

index 7a629ff..af101d1 100644 (file)
@@ -141,7 +141,6 @@ null_AM_MAKEFLAGS ?= \
   AUTOMAKE=false \
   AUTOHEADER=false \
   GPERF=false \
-  LIBTOOL=false \
   MAKEINFO=false
 
 ALL_RECURSIVE_TARGETS += my-distcheck
@@ -151,14 +150,15 @@ my-distcheck: $(DIST_ARCHIVES) $(local-check)
        -rm -rf $(t)
        mkdir -p $(t)
        $(amtar_extract_) $(preferred_tarball_) -C $(t)
-       cd $(t)/$(distdir)                              \
-         && ./configure --quiet --enable-gcc-warnings --disable-nls \
-         && $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)' \
-         && $(MAKE) dvi                                \
-         && $(install-transform-check)                 \
-         && $(my-instcheck)                            \
-         && $(coreutils-path-check)                    \
-         && $(MAKE) distclean
+       (set -e; cd $(t)/$(distdir);                    \
+         ./configure --quiet --enable-gcc-warnings --disable-nls; \
+         $(MAKE) AM_MAKEFLAGS='$(null_AM_MAKEFLAGS)';  \
+         $(MAKE) dvi;                                  \
+         $(install-transform-check);                   \
+         $(my-instcheck);                              \
+         $(coreutils-path-check);                      \
+         $(MAKE) distclean                             \
+       )
        (cd $(t) && mv $(distdir) $(distdir).old        \
          && $(amtar_extract_) - ) < $(preferred_tarball_)
        diff -ur $(t)/$(distdir).old $(t)/$(distdir)