Log Message:
-----------
Allow build to continue even if we lack JADE,
Fix the altperl make install problem as reported by: tgoodair at ca.afilias

Modified Files:
--------------
    slony1-engine:
        GNUmakefile.in (r1.16 -> r1.17)
    slony1-engine/doc/adminguide:
        Makefile (r1.10 -> r1.11)
    slony1-engine/doc/concept:
        Makefile (r1.7 -> r1.8)
    slony1-engine/doc/implementation:
        Makefile (r1.6 -> r1.7)
    slony1-engine/tools:
        Makefile (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -Ldoc/adminguide/Makefile -Ldoc/adminguide/Makefile -u -w -r1.10 -r1.11
--- doc/adminguide/Makefile
+++ doc/adminguide/Makefile
@@ -99,6 +99,7 @@
 
 COLLATEINDEX := LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g
 
+ifdef JADE
 ifeq (,$(wildcard HTML.index))
 bookindex.sgml:
 	$(COLLATEINDEX) -o $@ -N
@@ -106,6 +107,10 @@
 bookindex.sgml: HTML.index
 	$(COLLATEINDEX) -i 'bookindex' -o $@ $<
 endif
+else
+bookindex.sgml:
+	@echo "You must have jade to build the documentation" && exit
+endif
 
 ##
 ## Print
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/concept/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ldoc/concept/Makefile -Ldoc/concept/Makefile -u -w -r1.7 -r1.8
--- doc/concept/Makefile
+++ doc/concept/Makefile
@@ -63,8 +63,10 @@
 
 Slon.eps:	Slon_$(IMG_WID)x$(IMG_HT).jpg
 ifdef DJPEG
+ifdef PNMTOPS
 		$(DJPEG) $< | $(PNMTOPS) -rle -noturn >$@
 endif
+endif
 
 %.ps:	%.nr
 ifdef GROFF
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/implementation/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/implementation/Makefile -Ldoc/implementation/Makefile -u -w -r1.6 -r1.7
--- doc/implementation/Makefile
+++ doc/implementation/Makefile
@@ -61,8 +61,10 @@
 
 Slon.eps:	Slon_$(IMG_WID)x$(IMG_HT).jpg
 ifdef DJPEG
+ifdef PNMTOPS
 		$(DJPEG) $< | $(PNMTOPS) -rle -noturn >$@
 endif
+endif
 
 %.ps:	%.nr
 ifdef GROFF
Index: GNUmakefile.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/GNUmakefile.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -LGNUmakefile.in -LGNUmakefile.in -u -w -r1.16 -r1.17
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -27,13 +27,13 @@
 
 
 all:
-	@for subdir in src doc tools ; do \
+	@for subdir in src tools doc ; do \
 	  $(MAKE) -C $$subdir $@ || exit; \
     done && \
 	echo "All of Slony-I is successfully made. Ready to install"
 
 install	installdirs:
-	@for subdir in src doc tools share ; do \
+	@for subdir in src share tools doc ; do \
 	  $(MAKE) -C $$subdir $@ || exit; \
     done && \
 	echo "All of Slony-I is successfully installed"
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ltools/Makefile -Ltools/Makefile -u -w -r1.3 -r1.4
--- tools/Makefile
+++ tools/Makefile
@@ -15,9 +15,7 @@
 
 DISTFILES = Makefile slony_setup.pl generate_syncs.sh slony1_extract_schema.sh
 
-all install installdirs:
-
-clean distclean maintainer-clean:
+all install installdirs clean distclean maintainer-clean:
 	for subdir in $(SUBDIRS) ; do \
 		$(MAKE) -C $$subdir $@ ; \
 	done