New build target for new docs

diff --git a/pdns/docs/Makefile b/pdns/docs/Makefile
index 72edcdb3a647a5eadb86cc3a55787b1662388cbd..a672cf9a31252fba7b4f0a89b5a0fc2646e6d64b 100644 (file)
--- a/pdns/docs/Makefile
+++ b/pdns/docs/Makefile
@@ -2,7 +2,11 @@
 
 all: pdns.txt pdns.pdf html/index.html html.tar.bz2 pdns-expanded.html manpages
 
+pdns-expanded.xml: pdns.xml
+       ./expand < $< > $@
+
 clean:
+<<<<<<< HEAD
        rm -rf *.dvi *.pdf *.tex *.toc *.aux *.ps *.bak *.tmp *~ *.log pdns.txt html.tar.bz2 html pdns pdns-expanded.html pdns-expanded.xml pdns_recursor.1 rec_control.1 html-new doc-build
 
 manpages: dnsdist.1 pdns_recursor.1 rec_control.1 dnstcpbench.1
@@ -21,15 +25,23 @@ pdns-expanded.html: pdns-expanded.xml
 html.tar.bz2: html/index.html
        tar cjf html.tar.bz2 html/
 
+%.txt: %-expanded.xml
+       xmlto txt -m config.xsl  $<
+       mv pdns-expanded.txt pdns.txt
+
+%.pdf: %-expanded.xml
+       xmlto --with-dblatex pdf $<
+       mv pdns-expanded.pdf pdns.pdf
+
 %1.xml: %1.txt
        asciidoc -b docbook -d manpage  $<
-
+        
 %.1: %.1.xml
        xmlto man $<
-
+                
 %.html: %1.txt
        asciidoc -b xhtml11 -d manpage  $<
-
+                        
 publish:
        rsync --exclude "*.png" --copy-links --delete -avrz ./html pdns.txt pdns.pdf html.tar.bz2 \
                xs.powerdns.com:/var/www/doc.powerdns.com/
@@ -37,7 +49,3 @@ publish:
 publish3:
        rsync --exclude "*.png" --copy-links --delete -avrz ./html pdns.txt pdns.pdf html.tar.bz2 \
                peter@xs.powerdns.com:doc.powerdns.com/
-
-publish-lieter: html-new/index.html
-       rsync -avrz --delete ./html-new/* \
-         lieter@mango.plexis.eu:/srv/www/pdns-docs.plexis.eu/