Catch all errors in for and while loops in makefiles. Don't ignore any

errors in any commands, including in various clean targets that have so far
been handled inconsistently.  make -i is available to ignore all errors in
a consistent and official way.

15 files changed, 53 insertions, 85 deletions

diff --git a/src/Makefile b/src/Makefile
index 8d66bf62ca..61950967fd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/Makefile,v 1.42 2007/08/21 01:11:12 tgl Exp $
+# $PostgreSQL: pgsql/src/Makefile,v 1.43 2008/03/18 16:24:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -59,18 +59,18 @@ clean:
 	$(MAKE) -C test/thread $@
 
 distclean maintainer-clean:
-	-$(MAKE) -C port $@
-	-$(MAKE) -C timezone $@
-	-$(MAKE) -C backend $@
-	-$(MAKE) -C backend/snowball $@
-	-$(MAKE) -C include $@
-	-$(MAKE) -C interfaces $@
-	-$(MAKE) -C bin $@
-	-$(MAKE) -C pl $@
-	-$(MAKE) -C makefiles $@
-	-$(MAKE) -C test $@
-	-$(MAKE) -C tutorial NO_PGXS=1 $@
-	-$(MAKE) -C test/thread $@
+	$(MAKE) -C port $@
+	$(MAKE) -C timezone $@
+	$(MAKE) -C backend $@
+	$(MAKE) -C backend/snowball $@
+	$(MAKE) -C include $@
+	$(MAKE) -C interfaces $@
+	$(MAKE) -C bin $@
+	$(MAKE) -C pl $@
+	$(MAKE) -C makefiles $@
+	$(MAKE) -C test $@
+	$(MAKE) -C tutorial NO_PGXS=1 $@
+	$(MAKE) -C test/thread $@
 	rm -f Makefile.port Makefile.global
 
 
diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile
index ba0c60db28..466a507c08 100644
--- a/src/backend/snowball/Makefile
+++ b/src/backend/snowball/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/backend/snowball
 #
-# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.4 2007/10/23 20:46:12 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.5 2008/03/18 16:24:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -92,7 +92,8 @@ $(SQLSCRIPT): Makefile snowball_func.sql.in snowball.sql.in
 ifeq ($(enable_shared), yes)
 	echo '-- Language-specific snowball dictionaries' > $@
 	cat $(srcdir)/snowball_func.sql.in >> $@	
-	@set $(LANGUAGES) ; \
+	@set -e; \
+	set $(LANGUAGES) ; \
 	while [ "$$#" -gt 0 ] ; \
 	do \
 		lang=$$1; shift; \
@@ -120,7 +121,8 @@ ifeq ($(enable_shared), yes)
 	$(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)'
 endif
 	$(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'
-	@set $(LANGUAGES) ; \
+	@set -e; \
+	set $(LANGUAGES) ; \
 	while [ "$$#" -gt 0 ] ; \
 	do \
 		lang=$$1; shift; shift; \
@@ -135,7 +137,8 @@ installdirs:
 uninstall:
 	rm -f '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)'
 	rm -f '$(DESTDIR)$(datadir)/$(SQLSCRIPT)'
-	@set $(LANGUAGES) ; \
+	@set -e; \
+	set $(LANGUAGES) ; \
 	while [ "$$#" -gt 0 ] ; \
 	do \
 		lang=$$1; shift; shift;  \
diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile
index 57c8cde5d3..2bb45d8434 100644
--- a/src/backend/utils/mb/conversion_procs/Makefile
+++ b/src/backend/utils/mb/conversion_procs/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/mb/conversion_procs
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.18 2007/03/25 11:56:02 ishii Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.19 2008/03/18 16:24:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -164,7 +164,8 @@ all: $(SQLSCRIPT)
 
 $(SQLSCRIPT): Makefile
 ifeq ($(enable_shared), yes)
-	@set $(CONVERSIONS) ; \
+	@set -e; \
+	set $(CONVERSIONS) ; \
 	while [ "$$#" -gt 0 ] ; \
 	do \
 		name=$$1;shift; \
@@ -182,7 +183,8 @@ else
 endif
 
 $(REGRESSION_SCRIPT): Makefile
-	@cp regress_prolog $@; \
+	@set -e; \
+	cp regress_prolog $@; \
 	set $(CONVERSIONS) ; \
 	while [ "$$#" -gt 0 ] ; \
 	do \
@@ -210,5 +212,5 @@ uninstall:
 
 clean distclean maintainer-clean:
 	rm -f $(SQLSCRIPT)
-	@for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
+	@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
 
diff --git a/src/bin/Makefile b/src/bin/Makefile
index ec8f7ce9ea..5638935127 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/Makefile,v 1.51 2008/01/01 19:45:55 momjian Exp $
+# $PostgreSQL: pgsql/src/bin/Makefile,v 1.52 2008/03/18 16:24:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -19,8 +19,5 @@ ifeq ($(PORTNAME), win32)
 DIRS+=pgevent
 endif
 
-all install installdirs uninstall distprep:
+all install installdirs uninstall distprep clean distclean maintainer-clean:
 	@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
-
-clean distclean maintainer-clean:
-	-@for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index db0e4ff671..dd57c18c3e 100644
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/Makefile,v 1.55 2007/02/09 15:55:59 petere Exp $
+# $PostgreSQL: pgsql/src/interfaces/Makefile,v 1.56 2008/03/18 16:24:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,13 +14,5 @@ include $(top_builddir)/src/Makefile.global
 
 DIRS = libpq ecpg 
 
-ALLDIRS = $(DIRS) 
-
-all install installdirs uninstall distprep:
+all install installdirs uninstall distprep clean distclean maintainer-clean:
 	@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
-
-clean:
-	@for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
-
-distclean maintainer-clean:
-	@for dir in $(ALLDIRS); do $(MAKE) -C $$dir $@; done
diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
index c83144d895..71bfff672d 100644
--- a/src/interfaces/ecpg/Makefile
+++ b/src/interfaces/ecpg/Makefile
@@ -10,12 +10,12 @@ all install installdirs uninstall distprep:
 	$(MAKE) -C preproc $@
 
 clean distclean maintainer-clean:
-	-$(MAKE) -C include $@
-	-$(MAKE) -C pgtypeslib $@
-	-$(MAKE) -C ecpglib $@
-	-$(MAKE) -C compatlib $@
-	-$(MAKE) -C preproc $@
-	-$(MAKE) -C test clean
+	$(MAKE) -C include $@
+	$(MAKE) -C pgtypeslib $@
+	$(MAKE) -C ecpglib $@
+	$(MAKE) -C compatlib $@
+	$(MAKE) -C preproc $@
+	$(MAKE) -C test clean
 
 check checktcp installcheck: all
 	$(MAKE) -C test $@
diff --git a/src/pl/Makefile b/src/pl/Makefile
index 4a0f365472..fa06459a9b 100644
--- a/src/pl/Makefile
+++ b/src/pl/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/pl/Makefile,v 1.26 2007/06/01 19:38:07 tgl Exp $
+# $PostgreSQL: pgsql/src/pl/Makefile,v 1.27 2008/03/18 16:24:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -26,11 +26,8 @@ ifeq ($(with_tcl), yes)
 DIRS += tcl
 endif
 
-all install installdirs uninstall distprep:
-	@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit 1; done
-
-clean distclean maintainer-clean:
-	@for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
+all install installdirs uninstall distprep clean distclean maintainer-clean:
+	@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
 
 # We'd like check operations to run all the subtests before failing.
 check installcheck:
diff --git a/src/pl/plpgsql/Makefile b/src/pl/plpgsql/Makefile
index 118636cae3..2f1298c258 100644
--- a/src/pl/plpgsql/Makefile
+++ b/src/pl/plpgsql/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/pl/plpgsql/Makefile,v 1.8 2003/11/29 19:52:12 pgsql Exp $
+# $PostgreSQL: pgsql/src/pl/plpgsql/Makefile,v 1.9 2008/03/18 16:24:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,8 +12,5 @@ subdir = src/pl/plpgsql
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-all install installdirs uninstall distprep:
+all install installdirs uninstall distprep clean distclean maintainer-clean:
 	$(MAKE) -C src $@
-
-clean distclean maintainer-clean:
-	-$(MAKE) -C src $@
diff --git a/src/test/bench/Makefile b/src/test/bench/Makefile
index c528fc015c..4b0d713cb8 100644
--- a/src/test/bench/Makefile
+++ b/src/test/bench/Makefile
@@ -8,7 +8,7 @@
 #
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/test/bench/Makefile,v 1.15 2008/01/01 19:46:00 momjian Exp $
+#    $PostgreSQL: pgsql/src/test/bench/Makefile,v 1.16 2008/03/18 16:24:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,9 +31,9 @@ create.sql: create.source
 bench.sql: 
 	x=1; \
 	for i in `ls query[0-9][0-9]`; do \
-	  echo "select $$x as x" >> bench.sql; \
-	  cat $$i >> bench.sql; \
-	  x=`expr $$x + 1`; \
+	  echo "select $$x as x" >> bench.sql && \
+	  cat $$i >> bench.sql && \
+	  x=`expr $$x + 1` || exit; \
 	done
 
 runtest: $(OUTFILES)
diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile
index d34eedfce1..295f049ce8 100644
--- a/src/test/locale/Makefile
+++ b/src/test/locale/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/test/locale/Makefile,v 1.9 2003/11/29 19:52:14 pgsql Exp $
+# $PostgreSQL: pgsql/src/test/locale/Makefile,v 1.10 2008/03/18 16:24:50 petere Exp $
 
 subdir = src/test/locale
 top_builddir = ../../..
@@ -13,7 +13,7 @@ all: $(PROGS)
 clean: 
 	rm -f $(PROGS)
 	for d in $(DIRS); do \
-		$(MAKE) -C $$d clean; \
+		$(MAKE) -C $$d clean || exit; \
 	done
 
 check-%: all
diff --git a/src/test/locale/de_DE.ISO8859-1/Makefile b/src/test/locale/de_DE.ISO8859-1/Makefile
index 281014521e..fd8301928e 100644
--- a/src/test/locale/de_DE.ISO8859-1/Makefile
+++ b/src/test/locale/de_DE.ISO8859-1/Makefile
@@ -1,12 +1,7 @@
-#
-# Makefile for example programs
-#
-
 all: 
-	-@echo "make: Nothing to be done for \`all'."
 
 test: 
-	@./runall
+	./runall
 
 clean: 
 	rm -f *.out
diff --git a/src/test/locale/gr_GR.ISO8859-7/Makefile b/src/test/locale/gr_GR.ISO8859-7/Makefile
index 281014521e..fd8301928e 100644
--- a/src/test/locale/gr_GR.ISO8859-7/Makefile
+++ b/src/test/locale/gr_GR.ISO8859-7/Makefile
@@ -1,12 +1,7 @@
-#
-# Makefile for example programs
-#
-
 all: 
-	-@echo "make: Nothing to be done for \`all'."
 
 test: 
-	@./runall
+	./runall
 
 clean: 
 	rm -f *.out
diff --git a/src/test/locale/koi8-r/Makefile b/src/test/locale/koi8-r/Makefile
index 281014521e..fd8301928e 100644
--- a/src/test/locale/koi8-r/Makefile
+++ b/src/test/locale/koi8-r/Makefile
@@ -1,12 +1,7 @@
-#
-# Makefile for example programs
-#
-
 all: 
-	-@echo "make: Nothing to be done for \`all'."
 
 test: 
-	@./runall
+	./runall
 
 clean: 
 	rm -f *.out
diff --git a/src/test/locale/koi8-to-win1251/Makefile b/src/test/locale/koi8-to-win1251/Makefile
index 281014521e..fd8301928e 100644
--- a/src/test/locale/koi8-to-win1251/Makefile
+++ b/src/test/locale/koi8-to-win1251/Makefile
@@ -1,12 +1,7 @@
-#
-# Makefile for example programs
-#
-
 all: 
-	-@echo "make: Nothing to be done for \`all'."
 
 test: 
-	@./runall
+	./runall
 
 clean: 
 	rm -f *.out
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index 4d19f9c0bb..3920e3da21 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -6,7 +6,7 @@
 # Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.71 2008/01/01 19:46:00 momjian Exp $
+# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.72 2008/03/18 16:24:50 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -133,7 +133,7 @@ all-spi:
 # Tablespace setup
 .PHONY: tablespace-setup
 tablespace-setup:
-	-rm -rf ./testtablespace
+	rm -rf ./testtablespace
 	mkdir ./testtablespace
 
 ##