summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2011-05-02 00:47:09 +0300
committerPeter Eisentraut <peter_e@gmx.net>2011-05-02 01:03:38 +0300
commitc8c93c6e73b98fc8e0e371a8391d4824732437f2 (patch)
treeafbf1b96a635087542e9872eba9f554496c9c5a0 /src
parentfb69fd176aaa8eab0315c4f891297c03c0b5d825 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/makefiles/pgxs.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 7910c35bca0..a9cc7cabc49 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -98,26 +98,26 @@ install: all installdirs
ifneq (,$(DATA)$(DATA_built))
@for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \
echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/$(datamoduledir)'"; \
- $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/$(datamoduledir)'; \
+ $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/$(datamoduledir)' || exit; \
done
endif # DATA
ifneq (,$(DATA_TSEARCH))
@for file in $(addprefix $(srcdir)/, $(DATA_TSEARCH)); do \
echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/tsearch_data'"; \
- $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/tsearch_data'; \
+ $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/tsearch_data' || exit; \
done
endif # DATA_TSEARCH
ifdef MODULES
@for file in $(addsuffix $(DLSUFFIX), $(MODULES)); do \
echo "$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'"; \
- $(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'; \
+ $(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)' || exit; \
done
endif # MODULES
ifdef DOCS
ifdef docdir
@for file in $(addprefix $(srcdir)/, $(DOCS)); do \
echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/$(docmoduledir)'"; \
- $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/$(docmoduledir)'; \
+ $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/$(docmoduledir)' || exit; \
done
endif # docdir
endif # DOCS
@@ -127,13 +127,13 @@ endif # PROGRAM
ifdef SCRIPTS
@for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \
echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
- $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
+ $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)' || exit; \
done
endif # SCRIPTS
ifdef SCRIPTS_built
@for file in $(SCRIPTS_built); do \
echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
- $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
+ $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)' || exit; \
done
endif # SCRIPTS_built