Catch errors in for loop in makefile
Add "|| exit" so that the rule aborts when a command fails. This is the minimal backpatch version. The fix in head is more elaborate.
This commit is contained in:
parent
9b51d50c2f
commit
7b9bbb68e3
@ -90,20 +90,20 @@ install: all installdirs
|
|||||||
ifneq (,$(DATA)$(DATA_built))
|
ifneq (,$(DATA)$(DATA_built))
|
||||||
@for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \
|
@for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \
|
||||||
echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'"; \
|
echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'"; \
|
||||||
$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'; \
|
$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib' || exit; \
|
||||||
done
|
done
|
||||||
endif # DATA
|
endif # DATA
|
||||||
ifdef MODULES
|
ifdef MODULES
|
||||||
@for file in $(addsuffix $(DLSUFFIX), $(MODULES)); do \
|
@for file in $(addsuffix $(DLSUFFIX), $(MODULES)); do \
|
||||||
echo "$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'"; \
|
echo "$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'"; \
|
||||||
$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'; \
|
$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)' || exit; \
|
||||||
done
|
done
|
||||||
endif # MODULES
|
endif # MODULES
|
||||||
ifdef DOCS
|
ifdef DOCS
|
||||||
ifdef docdir
|
ifdef docdir
|
||||||
@for file in $(addprefix $(srcdir)/, $(DOCS)); do \
|
@for file in $(addprefix $(srcdir)/, $(DOCS)); do \
|
||||||
echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'"; \
|
echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'"; \
|
||||||
$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'; \
|
$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib' || exit; \
|
||||||
done
|
done
|
||||||
endif # docdir
|
endif # docdir
|
||||||
endif # DOCS
|
endif # DOCS
|
||||||
@ -116,13 +116,13 @@ endif # MODULE_big
|
|||||||
ifdef SCRIPTS
|
ifdef SCRIPTS
|
||||||
@for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \
|
@for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \
|
||||||
echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
|
echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
|
||||||
$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
|
$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)' || exit; \
|
||||||
done
|
done
|
||||||
endif # SCRIPTS
|
endif # SCRIPTS
|
||||||
ifdef SCRIPTS_built
|
ifdef SCRIPTS_built
|
||||||
@for file in $(SCRIPTS_built); do \
|
@for file in $(SCRIPTS_built); do \
|
||||||
echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
|
echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
|
||||||
$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
|
$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)' || exit; \
|
||||||
done
|
done
|
||||||
endif # SCRIPTS_built
|
endif # SCRIPTS_built
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user