CVS User Account cvsuser
Thu Jun 2 19:37:24 PDT 2005
Log Message:
-----------
Carry the --with-docs through to install + clean

Modified Files:
--------------
    slony1-engine:
        GNUmakefile.in (r1.21 -> r1.22)

-------------- next part --------------
Index: GNUmakefile.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/GNUmakefile.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -LGNUmakefile.in -LGNUmakefile.in -u -w -r1.21 -r1.22
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -12,6 +12,12 @@
 TAR = tar
 GZIP = gzip --best
 
+DEFAULTBUILDS=src tools
+
+ifeq (@with_docs@, yes)
+DEFAULTBUILDS+=" doc"
+endif
+
 DISTFILES = aclocal.m4 \
   config.h.in \
   configure \
@@ -30,22 +36,19 @@
 
 
 all:
-	@for subdir in src tools ; do \
+	@for subdir in $(DEFAULTBUILDS) ; do \
 	  $(MAKE) -C $$subdir $@ || exit; \
     done && \
-	if [ "@with_docs@" = "yes" ]; then \
-		$(MAKE) -C doc $@ || exit; \
-	fi; \
 	echo "All of Slony-I is successfully made. Ready to install"
 
 install	installdirs:
-	@for subdir in src tools doc ; do \
+	@for subdir in $(DEFAULTBUILDS) ; do \
 	  $(MAKE) -C $$subdir $@ || exit; \
     done && \
 	echo "All of Slony-I is successfully installed"
 
 clean:
-	@for subdir in src doc tools ; do \
+	@for subdir in $(DEFAULTBUILDS) ; do \
 	  $(MAKE) -C $$subdir $@ ; \
     done ;\
       rm -f postgres.imp


More information about the Slony1-commit mailing list