X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=doc%2FMakefile.am;h=31d6566997ea932ae60ee863a7a58a8982d7a9f4;hb=7d3e19217e35aa9674166cf632662d1b21e43910;hp=bafe70068f1a7857e7142a3bc362f34e0250ff66;hpb=998310ee5a6977da8d5852eecfd6557ef65eaf40;p=metaproxy-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index bafe700..31d6566 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,10 @@
 SUBDIRS = common
 
+INKSCAPE=inkscape
+
 SUFFIXES=.3mp .1 .pdf .tkl .esp .xml 
 
-XMLFILES = book.xml manref.xml copyright.xml
+XMLFILES = book.xml manref.xml copyright.xml gpl-2.0.xml
 
 MAINXML = $(srcdir)/book.xml
 
@@ -10,9 +12,11 @@ XMLMAN = metaproxy.xml \
 	auth_simple.xml \
 	backend_test.xml \
 	bounce.xml \
+	cgi.xml \
         cql_rpn.xml \
 	frontend_net.xml \
 	http_file.xml \
+	limit.xml \
 	load_balance.xml \
 	log.xml \
 	multi.xml \
@@ -29,9 +33,11 @@ MANFILES = metaproxy.1 \
 	auth_simple.3mp \
 	backend_test.3mp  \
 	bounce.3mp \
+	cgi.3mp \
         cql_rpn.3mp \
         frontend_net.3mp \
 	http_file.3mp \
+	limit.3mp \
 	load_balance.3mp \
 	log.3mp \
 	multi.3mp query_rewrite.3mp \
@@ -86,17 +92,18 @@ metaproxyj.pdf: $(XMLFILES) multi.pdf
 	pdfjadetex book.tex
 	mv book.pdf metaproxyj.pdf
 
-manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl
+manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl $(srcdir)/copyright.xml
 	rm -f manref.xml
 	for i in $(XMLMAN); do \
-		xsltproc $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
+		xsltproc --xinclude $(srcdir)/common/stripref.xsl $(srcdir)/$$i | sed 1d >> manref.xml; \
 	done
 
+
 multi.png: multi.svg
-	unset DISPLAY; inkscape --export-png=$@ --export-area=0:0:1050:500 $?
+	unset DISPLAY; ${INKSCAPE} --export-png=$@ --export-area=0:0:1050:500 $?
 
 multi.eps: multi.svg
-	unset DISPLAY; inkscape --export-eps=$@ --export-bbox-page $?
+	unset DISPLAY; ${INKSCAPE} --export-eps=$@ --export-bbox-page $?
 
 .eps.pdf:
 	epstopdf -hires $?
@@ -112,12 +119,12 @@ dist-hook:
 	done
 
 doc-clean:
-	rm -f *.html *.[0-9] *.?mp *.pdf *.tkl
+	rm -f manref.xml *.html *.[0-9] *.?mp *.pdf *.tkl
 
 install-data-hook:
 	if test -f index.html; then d=.; else d="$(srcdir)"; fi; \
 	for p in $$d/*.html; do \
-		$(docDATA_INSTALL) $$p $(DESTDIR)$(docdir); \
+		$(INSTALL_DATA) $$p $(DESTDIR)$(docdir); \
 	done
 
 uninstall-hook: