summaryrefslogtreecommitdiff
path: root/top
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-09-14 14:39:35 +0200
committerJim Meyering <meyering@redhat.com>2011-09-14 14:39:35 +0200
commite2c54cb6998369800c2a18df71bb4d0253e472ec (patch)
tree2363cafc2036c1ca15427fcfe2c4c338fee3b7ed /top
parent47cd5e6890272798588074518e1744263bdf08c8 (diff)
downloadgnulib-e2c54cb6998369800c2a18df71bb4d0253e472ec.tar.gz
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.
Diffstat (limited to 'top')
-rw-r--r--top/maint.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/top/maint.mk b/top/maint.mk
index c9ffb95a5b..bbb67ec5dc 100644
--- 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