From 7b9bbb68e38d9f39ec2b555b0b9aab9e50585c3e Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 2 May 2011 00:54:02 +0300 Subject: [PATCH] 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. --- src/makefiles/pgxs.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 1a0fa54c6ef..607201caaf8 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -90,20 +90,20 @@ install: all installdirs ifneq (,$(DATA)$(DATA_built)) @for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \ echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'"; \ - $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib'; \ + $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/contrib' || exit; \ done endif # DATA 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)/contrib'"; \ - $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib'; \ + $(INSTALL_DATA) $$file '$(DESTDIR)$(docdir)/contrib' || exit; \ done endif # docdir endif # DOCS @@ -116,13 +116,13 @@ endif # MODULE_big 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 -- 2.39.5