diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-12-14 11:33:03 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-12-14 11:33:03 +0100 |
| commit | bfcfc0ce7282c301d024fdd02c68edcc9aac0bf3 (patch) | |
| tree | 9d402f37540440631bbc206cfcbeddf0b351e585 /dist-check.mk | |
| parent | bf01ac3004bdfdbcf2e1214f6c2d83757207504a (diff) | |
| download | coreutils-bfcfc0ce7282c301d024fdd02c68edcc9aac0bf3.tar.xz | |
maint: improve dist-check.mk rules
* 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).
Diffstat (limited to 'dist-check.mk')
| -rw-r--r-- | dist-check.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dist-check.mk b/dist-check.mk index 7a629ff90..af101d1f5 100644 --- a/dist-check.mk +++ b/dist-check.mk @@ -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) |