Fix for bug # 159.

make distclean was deleting the flex/bison files in slony_logshipper.
These should be included in the tarfile.  They only should be deleted by
maintainer-clean.  However the maintainer-clean rule was invoking
clean on the subdirectories NOT maintainer-clean.
(cherry picked from commit bba22efd12bbcd61abbdcda4f264d175d8e103b2)

Conflicts:

	src/parsestatements/Makefile

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5a782242c25e6e212d8ec4e73b0036c64c255b0e..a11696d6bbbe22dc4ab0f7688347430929614f66 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -56,7 +56,10 @@ clean:
     done ;\
       rm -f postgres.imp
 
-distclean: clean
+distclean: 
+       @for subdir in $(DEFAULTBUILDS) ; do \
+         $(MAKE) -C $$subdir $@ || exit; \
+       done ;\
        rm -f Makefile.global Makefile.port
        rm -f GNUmakefile
        rm -f config.log config.status config.h
@@ -65,9 +68,14 @@ distclean: clean
        rm -f postgres.imp
        rm -rf autom4te.cache
 
-maintainer-clean: distclean
+maintainer-clean-internal:
+       @for subdir in $(DEFAULTBUILDS) ; do \
+         $(MAKE) -C $$subdir maintainer-clean || exit; \
+       done ;\
        rm -rf configure autom4te.cache
 
+maintainer-clean: maintainer-clean-internal distclean
+
 dist:  distdir
 
 distdir := @PACKAGE_NAME@-@PACKAGE_VERSION@

diff --git a/RELEASE b/RELEASE
index b7ee2492fa1049975343a4e5607feaf239be81b9..833f932d3489936167961dd5401d12bc08ee4b2c 100644 (file)
--- a/RELEASE
+++ b/RELEASE
@@ -2,6 +2,8 @@
 * Slony-I Release Notes
 ** 2.1.0 (beta 3)
 
+-Fix for bug #159, distclean deletes the slony_logshipper flex/bison generated files.
+
 - Bug #204 :: Additional fixes for failover to a non-direct subscriber
               where circular paths in sl_subscribe could happen
 
@@ -137,3 +139,4 @@
 ** RELEASE 2.0.6
 - Bug #162 :: typenameTypeId() changes signatures in 9.1
 
+

diff --git a/doc/howto/Makefile b/doc/howto/Makefile
index 755325ef41fe05709595b9325e58c21032aa0278..ab79eaacbc2c4ede9766679b91ce7fca0a046325 100644 (file)
--- a/doc/howto/Makefile
+++ b/doc/howto/Makefile
@@ -32,4 +32,4 @@ ifdef docdir
        done
 endif
 
-clean:
+clean distclean:

diff --git a/src/parsestatements/Makefile b/src/parsestatements/Makefile
index ef044b1bc3ca2ed4cb0774ee90b135b74b05b70d..09648c0540ccdc8caaceb78eb57fc326bf9da877 100644 (file)
--- a/src/parsestatements/Makefile
+++ b/src/parsestatements/Makefile
@@ -30,6 +30,7 @@ install:
 
 maintainer-clean: clean
 distclean: clean
+
 clean:
        rm -f scanner.o test-scanner test-scanner.o
        rm -f *.log

diff --git a/src/slony_logshipper/Makefile b/src/slony_logshipper/Makefile
index 2d6739b65ed617837a9839d12710e40acfb9d1e4..d5cbca71deee005548930409a57b871e21fdb174 100644 (file)
--- a/src/slony_logshipper/Makefile
+++ b/src/slony_logshipper/Makefile
@@ -71,7 +71,6 @@ endif
 
 clean distclean:
        rm -f $(ALL) $(OBJS) $(PROG).core
-       rm -f parser.c scan.c y.tab.h
 
 maintainer-clean:      clean
        rm -f parser.c scan.c y.tab.h