maint.mk: sc_tight_scope: propagate failure from sub-make

* top/maint.mk (sc_tight_scope): Actually initialize and use $fail.
Reported by Martin von Gagern.

diff --git a/ChangeLog b/ChangeLog
index 46c6251..bab5ba2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-14  Jim Meyering  <meyering@redhat.com>
+
+       maint.mk: sc_tight_scope: propagate failure from sub-make
+       * top/maint.mk (sc_tight_scope): Actually initialize and use $fail.
+       Reported by Martin von Gagern.
+
 2011-09-13  Bruno Haible  <bruno@clisp.org>
 
        tempname: Support for MSVC.

diff --git a/top/maint.mk b/top/maint.mk
index c9ffb95..bbb67ec 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1398,7 +1398,8 @@ _gl_TS_dir ?= src
 
 ALL_RECURSIVE_TARGETS += sc_tight_scope
 sc_tight_scope: tight-scope.mk
-       @if ! grep '^ *export _gl_TS_headers *=' $(srcdir)/cfg.mk       \
+       @fail=0;                                                        \
+       if ! grep '^ *export _gl_TS_headers *=' $(srcdir)/cfg.mk        \
                > /dev/null                                             \
           && ! grep -w noinst_HEADERS $(srcdir)/$(_gl_TS_dir)/Makefile.am \
                > /dev/null 2>&1; then                                  \
@@ -1410,8 +1411,9 @@ sc_tight_scope: tight-scope.mk
                -f $(abs_top_builddir)/$<                               \
              _gl_tight_scope                                           \
                || fail=1;                                              \
-       fi
-       @rm -f $<
+       fi;                                                             \
+       rm -f $<;                                                       \
+       exit $$fail
 
 tight-scope.mk: $(ME)
        @rm -f $@ $@-t