---
 doc/adminguide/Makefile |   23 +++++++++++++++--------
 tools/build_release.sh  |    6 +++++-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/doc/adminguide/Makefile b/doc/adminguide/Makefile
index 5b769cb..5c5aff0 100644
--- a/doc/adminguide/Makefile
+++ b/doc/adminguide/Makefile
@@ -139,6 +139,19 @@ endif
 %.tex-pdf: %.sgml $(ALLSGML) stylesheet.dsl
 	$(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -t tex -V tex-backend -ioutput-print -V texpdf-output -o $@ $<
 
+%.pdf: %.xml
+	sed -i "s:<article:<sect1:g;s:</article:</sect1:g" $<;
+	# We use dblatex to generate a temporary Tex file named (for example) 'slony-tmp.tex'
+	dblatex -t tex -o slony-tmp.tex $<
+	#  We drop bad lines "\end{document}" generated by dblatex
+	grep -vE '^(\\end{document}|\\subsection\*)$$' slony-tmp.tex > slony.tex
+	# We put the required '\end{document}' at the end of the Tex file
+	echo "\end{document}" >>  slony.tex
+	# Latex required to run the following command 3 times in order to generating the TOC of the document
+	pdflatex slony.tex
+	pdflatex slony.tex
+	pdflatex slony.tex
+
 %.dvi: %.tex-ps
 	@rm -f $*.aux $*.log
 	jadetex $<
@@ -149,12 +162,6 @@ endif
 %.ps: %.dvi
 	dvips -o $@ $<
 
-%.pdf: %.tex-pdf
-	@rm -f $*.aux $*.log $*.out
-	pdfjadetex $<
-	pdfjadetex $<
-	pdfjadetex $<
-
 
 # This generates an XML version of the flow-object tree.  It's useful
 # for debugging DSSSL code, and possibly to interface to some other
@@ -241,13 +248,13 @@ clean distclean maintainer-clean:
 # man
 	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
+	rm -f *.rtf *.tex-ps *.tex-pdf *.dvi *.aux *.log *.ps *.pdf *.out *.eps *.fot *.tex *-temp.tex *.toc *.toc *.loc *.lot *.glo
 # index
 	rm -f HTML.index $(GENERATED_SGML)
 # text
 	rm -f INSTALL HISTORY
 # xml
-	rm -f schemadoc.xml
+	rm -f schemadoc.xml slony.xml
 
 BASEDIR=$(slony_top_builddir)/src/backend
 BASESQL=$(BASEDIR)/slony1_base.sql
diff --git a/tools/build_release.sh b/tools/build_release.sh
index 86caad8..1265409 100755
--- a/tools/build_release.sh
+++ b/tools/build_release.sh
@@ -65,6 +65,10 @@ cd doc/adminguide
 make html
 make html
 make man
+# build PDF.  This requires dblatex
+#
+make slony.xml
+make slony.pdf
 cd ..
 cd ..
 sh tools/release_checklist.sh
@@ -81,7 +85,7 @@ then
 fi
 
 cd ..
-tar -cjf slony1-$REL_VERSION-docs.tar.bz2 slony1-$REL_VERSION/doc/adminguide/*html slony1-$REL_VERSION/doc/adminguide/*man* slony1-$REL_VERSION/doc/adminguide/*png slony1-$REL_VERSION/doc/adminguide/*css
+tar -cjf slony1-$REL_VERSION-docs.tar.bz2 slony1-$REL_VERSION/doc/adminguide/*html slony1-$REL_VERSION/doc/adminguide/*man* slony1-$REL_VERSION/doc/adminguide/*png slony1-$REL_VERSION/doc/adminguide/*css slony1-$REL_VERSION/doc/adminguide/slony.pdf
 cd slony1-$REL_VERSION
 make distclean
 cd ..
-- 
1.7.0.4


--------------040007080002080208090200--