Log Message:
-----------
Man creation fixes. Introducing --with-mandir for install destination of manpages and --with-d2mdir for the docbook2man tool. Manpages will only be created if d2mdir is specified.

Modified Files:
--------------
    slony1-engine:
        Makefile.global.in (r1.33 -> r1.34)
        configure.ac (r1.55 -> r1.56)
    slony1-engine/config:
        docbook.m4 (r1.4 -> r1.5)
    slony1-engine/doc/adminguide:
        Makefile (r1.17 -> r1.18)

-------------- next part --------------
Index: docbook.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/docbook.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lconfig/docbook.m4 -Lconfig/docbook.m4 -u -w -r1.4 -r1.5
--- config/docbook.m4
+++ config/docbook.m4
@@ -11,6 +11,20 @@
 AC_DEFUN([SLON_AC_PROG_NSGMLS],
 [AC_CHECK_PROGS([NSGMLS], [onsgmls nsgmls])])
 
+AC_DEFUN([SLON_AC_PROG_SGMLSPL],
+[AC_CHECK_PROGS([SGMLSPL], [sgmlspl])])
+
+# SLON_AC_PROG_D2M
+# ----------------
+AC_DEFUN([SLON_AC_PROG_D2M],
+[AC_MSG_CHECKING([for docbook2man-spec.pl],[slon_cv_check_d2mdir])
+if test -s "$with_d2mdir/docbook2man-spec.pl" ; then
+    AC_SUBST(d2mdir, $with_d2mdir)
+    AC_MSG_RESULT([found])
+  else 
+    AC_MSG_RESULT([not found, skipping manpages.
+Please use --with-d2mdir to specify the path to docbook2man-spec.pl])
+fi])
 
 # SLON_AC_CHECK_DOCBOOK(VERSION)
 # ---------------------------
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.33 -r1.34
--- Makefile.global.in
+++ Makefile.global.in
@@ -67,7 +67,8 @@
 COLLATEINDEX=		@COLLATEINDEX@
 PGAUTODOC=		@PGAUTODOC@
 docdir=			@docdir@
-
+mandir=			@mandir@
+D2MDIR=			@d2mdir@
 #perltools
 perlsharedir=		@perlsharedir@
 
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.55
retrieving revision 1.56
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.55 -r1.56
--- configure.ac
+++ configure.ac
@@ -133,10 +133,12 @@
 AC_ARG_WITH(pgpkglibdir,        [  --with-pgpkglibdir=<dir>         Location of the PostgreSQL pkglibs. E.g. plpgsql.so ])
 AC_ARG_WITH(pgsharedir,         [  --with-pgsharedir=<dir>          Location of the PostgreSQL share dir. E.g. postgresql.conf.sample ])
 AC_ARG_WITH(netsnmp,            [  --with-netsnmp=<dir>             Enable snmp support <dir> is the location of net-snmp-config. **EXPERIMENTAL** ])
-AC_ARG_WITH(perltools,          [  --with-perltools=<dir>           Location to install the perl management tools Default $PREFIX/bin. ])
-AC_ARG_WITH(perlsharedir,       [  --with-perlsharedir=<dir>        Location to install slon-tools.pm Default $pglibdir. ])
-AC_ARG_WITH(docdir,		[  --with-docdir=<dir>              Location to install all the documentation Default is $PREFIX/doc. ])
+AC_ARG_WITH(perltools,          [  --with-perltools=<dir>           Location to install the perl management tools. Default $PREFIX/bin. ])
+AC_ARG_WITH(perlsharedir,       [  --with-perlsharedir=<dir>        Location to install slon-tools.pm. Default $pglibdir. ])
 AC_ARG_WITH(docs,		[  --with-docs=<yes|no>             Build the sgml documentation [default=no]])
+AC_ARG_WITH(docdir,		[  --with-docdir=<dir>              Location to install all the documentation. Default is $PREFIX/doc. ])
+AC_ARG_WITH(d2mdir,		[  --with-d2mdir=<dir>              Location of docbook2man-spec.pl (Manpages will be skipped if not specified)])
+AC_ARG_WITH(mandir,		[  --with-mandir=<dir>              Location to install the manpages. Default is $PREFIX/man.])
 
 #Our current path
 SLONYPATH=`pwd`
@@ -198,12 +200,16 @@
 	# Check for DocBook and tools
 	#
 	SLON_AC_PROG_NSGMLS
+	SLON_AC_PROG_SGMLSPL
+	SLON_AC_PROG_D2M
+
 	SLON_AC_PROG_JADE
 	SLON_AC_CHECK_DOCBOOK(4.2)
 	SLON_AC_PATH_DOCBOOK_STYLESHEETS
 	SLON_AC_PATH_COLLATEINDEX
-	AC_SUBST(SGMLSPL, $SGMLSPL)
+
 	AC_SUBST(docdir, $docdir)
+	AC_SUBST(mandir, $mandir)
 else
   AC_MSG_RESULT(no)
 fi
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -Ldoc/adminguide/Makefile -Ldoc/adminguide/Makefile -u -w -r1.17 -r1.18
--- doc/adminguide/Makefile
+++ doc/adminguide/Makefile
@@ -29,6 +29,11 @@
 override JADEFLAGS += -V draft-mode
 endif
 
+# docbook2man generates man pages from docbook refentry source code.
+ifdef D2MDIR
+D2MSCRIPT=$(D2MDIR)/docbook2man-spec.pl
+endif
+
 # Enable some extra warnings
 override SPFLAGS += -wall -wno-unused-param -wno-empty
 
@@ -38,18 +43,17 @@
 
 .PHONY: man
 
-DEFAULTSECTION := $(sqlmansect_dummy)
 
-man: slony.sgml $(ALLSGML)
+man: man.sgml $(ALLSGML)
 ifdef NSGMLS
 ifdef SGMLSPL
 ifdef D2MSCRIPT
-	$(NSGMLS) $(NSGMLS_FLAGS) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
+	$(NSGMLS) $(NSGMLS_FLAGS) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --date "`date '+%Y-%m-%d'`"
 # One more time, to resolve cross-references
-	$(NSGMLS) $(NSGMLS_FLAGS) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
-	mkdir -p man1 man$(DEFAULTSECTION)
+	$(NSGMLS) $(NSGMLS_FLAGS) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --date "`date '+%Y-%m-%d'`"
+	mkdir -p man1 man7
 	mv *.1 man1/
-	mv *.$(DEFAULTSECTION) man$(DEFAULTSECTION)/
+	mv *.7 man7/
 endif
 endif
 endif
@@ -64,8 +68,8 @@
 ifdef docdir
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/sgml
 	$(mkinstalldirs) $(DESTDIR)$(docdir)/html
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/man1
-	$(mkinstalldirs) $(DESTDIR)$(docdir)/man$(DEFAULTSECTION)
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man7
 endif
 
 install: installdirs
@@ -74,10 +78,10 @@
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/sgml; \
 	done
 	for file in $(wildcard man1/*) ; do \
-	   $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/man1 ;\
+	   $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man1 ;\
 	done
-	for file in $(wildcard man$(DEFAULTSECTION)/*) ; do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/man$(DEFAULTSECTION) ;\
+	for file in $(wildcard man7/*) ; do \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man7 ;\
 	done
 	for file in $(wildcard *.html) stylesheet.css ; do \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/html ;\
@@ -232,7 +236,7 @@
 # HTML
 	rm -f HTML.manifest *.html *.gif
 # man
-	rm -rf *.1 *.$(DEFAULTSECTION) man1 man$(DEFAULTSECTION) manpage.refs manpage.links manpage.log
+	rm -rf *.1 *.7 man1 man7 manpage.refs manpage.links manpage.log
 # print
 	rm -f *.rtf *.tex-ps *.tex-pdf *.dvi *.aux *.log *.ps *.pdf *.out *.eps *.fot
 # index