Rewrite installation makefile rules without for loops

install-sh can install multiple files at once, so for loops are not
necessary.  This was already changed for the rest of the code some
time ago, but pgxs.mk was apparently forgotten, and the obsolete
coding style has now been copied to the PLs as well.

This also fixes the problem that the for loops in question did not
catch errors.

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 7fb007fb1c3a174c7c3ec1dc379b32109dbd909e..05ed8416a9f9372ff4a4ddd4ccab4d402cfefeb0 100644 (file)
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -103,51 +103,30 @@ endif # MODULE_big
 
 install: all installdirs
 ifneq (,$(EXTENSION))
-       @for file in $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))); do \
-         echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'"; \
-         $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'; \
-       done
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'
 endif # EXTENSION
 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)'; \
-       done
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) $(DATA_built) '$(DESTDIR)$(datadir)/$(datamoduledir)/'
 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'; \
-       done
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA_TSEARCH)) '$(DESTDIR)$(datadir)/tsearch_data/'
 endif # DATA_TSEARCH
 ifdef MODULES
-       @for file in $(addsuffix $(DLSUFFIX), $(MODULES)); do \
-         echo "$(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'"; \
-         $(INSTALL_SHLIB) $$file '$(DESTDIR)$(pkglibdir)'; \
-       done
+       $(INSTALL_SHLIB) $(addsuffix $(DLSUFFIX), $(MODULES)) '$(DESTDIR)$(pkglibdir)/'
 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)'; \
-       done
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DOCS)) '$(DESTDIR)$(docdir)/$(docmoduledir)/'
 endif # docdir
 endif # DOCS
 ifdef PROGRAM
        $(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
 endif # PROGRAM
 ifdef SCRIPTS
-       @for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \
-         echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
-         $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
-       done
+       $(INSTALL_SCRIPT) $(addprefix $(srcdir)/, $(SCRIPTS)) '$(DESTDIR)$(bindir)/'
 endif # SCRIPTS
 ifdef SCRIPTS_built
-       @for file in $(SCRIPTS_built); do \
-         echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
-         $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'; \
-       done
+       $(INSTALL_SCRIPT) $(SCRIPTS_built) '$(DESTDIR)$(bindir)/'
 endif # SCRIPTS_built
 
 ifdef MODULE_big

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 155b60f43fdd6a7e73f5aee88594d3ed867099a4..79a8d5d3fadbc70169384c83fe55c4cef3a66e8e 100644 (file)
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -82,10 +82,7 @@ installdirs: installdirs-lib
 uninstall: uninstall-lib uninstall-data
 
 install-data: installdirs
-       @for file in $(addprefix $(srcdir)/, $(DATA)); do \
-         echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'"; \
-         $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'; \
-       done
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) '$(DESTDIR)$(datadir)/extension/'
 
 uninstall-data:
        rm -f $(addprefix '$(DESTDIR)$(datadir)/extension'/, $(notdir $(DATA)))

diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile
index 52fbc1c41a225575f114d7cbc5c6c65ba301c093..751a98dbb02b7e84d3db1f0c06ce10f960bc860c 100644 (file)
--- a/src/pl/plpgsql/src/Makefile
+++ b/src/pl/plpgsql/src/Makefile
@@ -35,10 +35,7 @@ installdirs: installdirs-lib
 uninstall: uninstall-lib uninstall-data
 
 install-data: installdirs
-       @for file in $(addprefix $(srcdir)/, $(DATA)); do \
-         echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'"; \
-         $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'; \
-       done
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) '$(DESTDIR)$(datadir)/extension/'
 
 uninstall-data:
        rm -f $(addprefix '$(DESTDIR)$(datadir)/extension'/, $(notdir $(DATA)))

diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 86d8741e284120a5180af285932ba9668d8e45aa..93425cdb3450629a31a9175e18f1c34a6b713df6 100644 (file)
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -114,10 +114,7 @@ installdirs: installdirs-lib
 uninstall: uninstall-lib uninstall-data
 
 install-data: installdirs
-       @for file in $(addprefix $(srcdir)/, $(DATA)); do \
-         echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'"; \
-         $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'; \
-       done
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) '$(DESTDIR)$(datadir)/extension/'
 
 uninstall-data:
        rm -f $(addprefix '$(DESTDIR)$(datadir)/extension'/, $(notdir $(DATA)))

diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index faffd09fd3e0f33ae74540ee724f4df2a4a07fd2..77c173bcd8c4c809a867d891d2f20469e54a3468 100644 (file)
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -65,10 +65,7 @@ uninstall: uninstall-lib uninstall-data
        $(MAKE) -C modules $@
 
 install-data: installdirs
-       @for file in $(addprefix $(srcdir)/, $(DATA)); do \
-         echo "$(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'"; \
-         $(INSTALL_DATA) $$file '$(DESTDIR)$(datadir)/extension'; \
-       done
+       $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) '$(DESTDIR)$(datadir)/extension/'
 
 uninstall-data:
        rm -f $(addprefix '$(DESTDIR)$(datadir)/extension'/, $(notdir $(DATA)))