From 549508499c48085f1ce6db8fa8b6bea71db23c3d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 11 Dec 2010 03:36:46 +0100 Subject: [PATCH] build: stop on error in subcommand make only evaluates $? of an entire shell invocation. As such, if any command in the chain can fail, $? needs to be thrown, and early so. --- Makefile.iptrules.in | 6 +++--- Makefile.mans.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.iptrules.in b/Makefile.iptrules.in index 3b1ada5..53dbc92 100644 --- a/Makefile.iptrules.in +++ b/Makefile.iptrules.in @@ -46,15 +46,15 @@ subdirs_list := $(filter %/,${obj-m}) .PHONY: all install clean all: ${targets} - @for i in ${subdirs_list}; do ${MAKE} -C $$i; done; + @for i in ${subdirs_list}; do ${MAKE} -C $$i || exit $$?; done; install: ${targets} - @for i in ${subdirs_list}; do ${MAKE} -C $$i $@; done; + @for i in ${subdirs_list}; do ${MAKE} -C $$i $@ || exit $$?; done; install -dm0755 "${DESTDIR}/${xtlibdir}"; @for i in $^; do install -pm0755 $$i "${DESTDIR}/${xtlibdir}"; done; clean: - @for i in ${subdirs_list}; do ${MAKE} -C $$i $@; done; + @for i in ${subdirs_list}; do ${MAKE} -C $$i $@ || exit $$?; done; rm -f *.oo *.so; lib%.so: lib%.oo diff --git a/Makefile.mans.in b/Makefile.mans.in index 68cc36a..dccadbb 100644 --- a/Makefile.mans.in +++ b/Makefile.mans.in @@ -23,7 +23,7 @@ man_run = \ name="$${name\#\#*/libxt_}"; \ if [ -f "$$ext" ]; then \ echo ".SS $$name"; \ - cat "$$ext"; \ + cat "$$ext" || exit $$?; \ continue; \ fi; \ done >$@;