[prev in list] [next in list] [prev in thread] [next in thread] 

List:       slony1-commit
Subject:    [Slony1-commit] By xfade: Patch for bug #1571: Error checking in
From:       cvsuser () gborg ! postgresql ! org (CVS User Account)
Date:       2006-08-02 15:32:05
Message-ID: 20060802153205.5655211BF028 () gborg ! postgresql ! org
[Download RAW message or body]

Log Message:
-----------
Patch for bug #1571: Error checking in Makefiles. Patch provided by Peter Eisentraut.

Modified Files:
--------------
    slony1-engine:
        GNUmakefile.in (r1.28 -> r1.29)
    slony1-engine/doc:
        Makefile (r1.11 -> r1.12)
    slony1-engine/doc/adminguide:
        Makefile (r1.18 -> r1.19)
    slony1-engine/doc/concept:
        Makefile (r1.12 -> r1.13)
    slony1-engine/doc/howto:
        Makefile (r1.9 -> r1.10)
    slony1-engine/doc/implementation:
        Makefile (r1.11 -> r1.12)
    slony1-engine/share:
        Makefile (r1.3 -> r1.4)
    slony1-engine/src:
        Makefile (r1.12 -> r1.13)
    slony1-engine/src/backend:
        Makefile (r1.21 -> r1.22)
    slony1-engine/src/ducttape:
        Makefile (r1.11 -> r1.12)
    slony1-engine/src/slon:
        Makefile (r1.40 -> r1.41)
    slony1-engine/src/slonik:
        Makefile (r1.23 -> r1.24)
    slony1-engine/src/xxid:
        Makefile (r1.19 -> r1.20)
    slony1-engine/tools:
        Makefile (r1.4 -> r1.5)
    slony1-engine/tools/altperl:
        Makefile (r1.13 -> r1.14)

-------------- next part --------------
Index: GNUmakefile.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/GNUmakefile.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -LGNUmakefile.in -LGNUmakefile.in -u -w -r1.28 -r1.29
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -52,7 +52,7 @@
 
 clean:
 	@for subdir in $(DEFAULTBUILDS) ; do \
-	  $(MAKE) -C $$subdir $@ ; \
+	  $(MAKE) -C $$subdir $@ || exit; \
     done ;\
       rm -f postgres.imp
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -Ldoc/Makefile -Ldoc/Makefile -u -w -r1.11 -r1.12
--- doc/Makefile
+++ doc/Makefile
@@ -17,7 +17,7 @@
 
 all clean distclean maintainer-clean install installdirs:
 	@for subdir in $(SUBDIRS) ; do \
-		$(MAKE) -C $$subdir $@ ; \
+		$(MAKE) -C $$subdir $@ || exit; \
 	done
 
 
@@ -25,10 +25,10 @@
 	mkdir -p $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	@for file in $(DISTFILES) ; do \
-		cp $$file $(distdir)/$(subdir)/$$file ; \
+		cp $$file $(distdir)/$(subdir)/$$file || exit; \
 	done
 	@for subdir in $(SUBDIRS) ; do \
-		$(MAKE) -C $$subdir distdir ; \
+		$(MAKE) -C $$subdir distdir || exit; \
 	done
 
 adminguide.tar:
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -Ldoc/adminguide/Makefile -Ldoc/adminguide/Makefile -u -w -r1.18 -r1.19
--- doc/adminguide/Makefile
+++ doc/adminguide/Makefile
@@ -75,16 +75,16 @@
 install: installdirs
 ifdef docdir
 	for file in $(wildcard $(srcdir)/*.sgml) ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/sgml; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/sgml || exit; \
 	done
 	for file in $(wildcard man1/*) ; do \
-	   $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man1 ;\
+	   $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man1 || exit;\
 	done
 	for file in $(wildcard man7/*) ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man7 ;\
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man7 || exit;\
 	done
 	for file in $(wildcard *.html) stylesheet.css ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/html ;\
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/html || exit;\
 	done
 endif
 
@@ -274,6 +274,6 @@
 	mkdir -p $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	@for file in $(DISTFILES) ; do \
-		cp $$file $(distdir)/$(subdir)/$$file ; \
+		cp $$file $(distdir)/$(subdir)/$$file || exit; \
 	done
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/concept/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -Ldoc/concept/Makefile -Ldoc/concept/Makefile -u -w -r1.12 -r1.13
--- doc/concept/Makefile
+++ doc/concept/Makefile
@@ -50,7 +50,7 @@
 install: installdirs all
 ifdef docdir
 	for file in $(PS) $(PDF) $(TXT) Slon_$(IMG_WID)x$(IMG_HT).jpg ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/concept ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/concept || exit; \
 	done
 endif
 
@@ -126,6 +126,6 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/howto/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -Ldoc/howto/Makefile -Ldoc/howto/Makefile -u -w -r1.9 -r1.10
--- doc/howto/Makefile
+++ doc/howto/Makefile
@@ -15,7 +15,7 @@
 	mkdir -p $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
 
 all:
@@ -28,6 +28,6 @@
 install: all installdirs
 ifdef docdir
 	for file in $(wildcard *.txt) $(wildcard *.html ); do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/howto ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/howto || exit; \
 	done
 endif
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/Makefile -Lsrc/Makefile -u -w -r1.12 -r1.13
--- src/Makefile
+++ src/Makefile
@@ -26,8 +26,8 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	@for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
 	@for subdir in $(SUBDIRS) ; do \
-	  $(MAKE) -C $$subdir distdir ; \
+	  $(MAKE) -C $$subdir distdir || exit; \
     done
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/share/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lshare/Makefile -Lshare/Makefile -u -w -r1.3 -r1.4
--- share/Makefile
+++ share/Makefile
@@ -24,5 +24,5 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -Lsrc/backend/Makefile -Lsrc/backend/Makefile -u -w -r1.21 -r1.22
--- src/backend/Makefile
+++ src/backend/Makefile
@@ -70,6 +70,6 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/ducttape/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lsrc/ducttape/Makefile -Lsrc/ducttape/Makefile -u -w -r1.11 -r1.12
--- src/ducttape/Makefile
+++ src/ducttape/Makefile
@@ -41,13 +41,13 @@
 
 test:
 	for script in $(TESTS) ; do \
-	  ./$$script ; \
+	  ./$$script || exit; \
 	done
 
 distdir: $(DISTFILES)
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.40 -r1.41
--- src/slon/Makefile
+++ src/slon/Makefile
@@ -106,6 +106,6 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lsrc/slonik/Makefile -Lsrc/slonik/Makefile -u -w -r1.23 -r1.24
--- src/slonik/Makefile
+++ src/slonik/Makefile
@@ -84,5 +84,5 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/xxid/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lsrc/xxid/Makefile -Lsrc/xxid/Makefile -u -w -r1.19 -r1.20
--- src/xxid/Makefile
+++ src/xxid/Makefile
@@ -60,7 +60,7 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
 
 ifeq ($(PORTNAME), aix)
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ltools/Makefile -Ltools/Makefile -u -w -r1.4 -r1.5
--- tools/Makefile
+++ tools/Makefile
@@ -17,7 +17,7 @@
 
 all install installdirs clean distclean maintainer-clean:
 	for subdir in $(SUBDIRS) ; do \
-          $(MAKE) -C $$subdir $@ ; \
+          $(MAKE) -C $$subdir $@ || exit; \
         done
 
 
@@ -25,8 +25,8 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-		cp $$file $(distdir)/$(subdir)/$$file ; \
+		cp $$file $(distdir)/$(subdir)/$$file || exit; \
 	done
 	for subdir in $(SUBDIRS) ; do \
-		$(MAKE) -C $$subdir distdir ; \
+		$(MAKE) -C $$subdir distdir || exit; \
 	done
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/implementation/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -Ldoc/implementation/Makefile -Ldoc/implementation/Makefile -u -w -r1.11 -r1.12
--- doc/implementation/Makefile
+++ doc/implementation/Makefile
@@ -48,7 +48,7 @@
 install: all installdirs
 ifdef docdir
 	for file in $(PS) $(PDF) $(TXT) Slon.eps Slon_$(IMG_WID)x$(IMG_HT).jpg ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/implementation ; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/implementation || exit; \
 	done
 endif
 
@@ -123,6 +123,6 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-      cp $$file $(distdir)/$(subdir)/$$file ; \
+      cp $$file $(distdir)/$(subdir)/$$file || exit; \
     done
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -Ltools/altperl/Makefile -Ltools/altperl/Makefile -u -w -r1.13 -r1.14
--- tools/altperl/Makefile
+++ tools/altperl/Makefile
@@ -23,14 +23,15 @@
 	exit 1;
 endif
 	@for file in $(wildcard *.pl) $(wildcard *.pm); do \
-		tmpname=`echo $$file | $(SED) "s#\.p[lm]##"` ; \
+		tmpname=`echo $$file | $(SED) "s#\.p[lm]##"` && \
 		$(SED) -e "s#@@PERL@@#$(PERL)#;" \
                        -e "s#@@SYSCONFDIR@@#$(sysconfdir)#;" \
                        -e "s#@@PGLIBDIR@@#$(pglibdir)#;" \
                        -e "s#@@PGBINDIR@@#$(pgbindir)#;" \
                        -e "s#@@TOOLSBIN@@#$(toolsbin)#;" \
-                       $$file > $$tmpname; \
-		chmod 755 $$tmpname; \
+                       $$file > $$tmpname && \
+		chmod 755 $$tmpname \
+		|| exit; \
 	done
 endif
 
@@ -41,8 +42,9 @@
 	$(INSTALL_DATA)   slon_tools.conf-sample $(DESTDIR)$(sysconfdir)
 	$(INSTALL_DATA)   slon-tools             $(DESTDIR)$(perlsharedir)/slon-tools.pm
 	for file in $(wildcard *.pl) ; do \
-		tmpname=`echo $$file | $(SED) "s#\.pl##"` ; \
-		$(INSTALL_SCRIPT) $$tmpname $(DESTDIR)$(toolsbin) ; \
+		tmpname=`echo $$file | $(SED) "s#\.pl##"` && \
+		$(INSTALL_SCRIPT) $$tmpname $(DESTDIR)$(toolsbin) \
+		|| exit; \
 	done
 endif
 
@@ -55,12 +57,12 @@
 	mkdir $(distdir)/$(subdir)
 	-chmod 777 $(distdir)/$(subdir)
 	for file in $(DISTFILES) ; do \
-		cp $$file $(distdir)/$(subdir)/$$file ; \
+		cp $$file $(distdir)/$(subdir)/$$file || exit; \
 	done
 
 clean distclean maintainer-clean:
 	@for file in $(wildcard *.pl) $(wildcard *.pm); do \
-		tmpname=`echo $$file | $(SED) "s#\.p[lm]##"` ; \
-		rm -f $$tmpname ; \
+		tmpname=`echo $$file | $(SED) "s#\.p[lm]##"` && \
+		rm -f $$tmpname \
+		|| exit; \
 	done
-

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic