X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile.am;h=13d5b1526ccb9db5cab79369b968c0ae94f5c187;hb=b8f2a2ba8d050d936b7f5fbdd6c2d057d032fec7;hp=f9bed9ea82cdda671a5185eb0d81ee08df8accb6;hpb=ddc156360c0c46ef669accde05fea1106cc6b244;p=metaproxy-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f9bed9e..13d5b15 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = common
 
+INKSCAPE=inkscape
+
 SUFFIXES=.3mp .1 .pdf .tkl .esp .xml 
 
 XMLFILES = book.xml manref.xml copyright.xml gpl-2.0.xml
@@ -10,6 +12,7 @@ XMLMAN = metaproxy.xml \
 	auth_simple.xml \
 	backend_test.xml \
 	bounce.xml \
+	cgi.xml \
         cql_rpn.xml \
 	frontend_net.xml \
 	http_file.xml \
@@ -24,12 +27,14 @@ XMLMAN = metaproxy.xml \
 	template.xml \
 	virt_db.xml \
 	z3950_client.xml \
+	zoom.xml \
         zeerex_explain.xml
 
 MANFILES = metaproxy.1 \
 	auth_simple.3mp \
 	backend_test.3mp  \
 	bounce.3mp \
+	cgi.3mp \
         cql_rpn.3mp \
         frontend_net.3mp \
 	http_file.3mp \
@@ -43,8 +48,8 @@ MANFILES = metaproxy.1 \
 	template.3mp \
 	virt_db.3mp \
 	z3950_client.3mp \
-	zeerex_explain.3mp
-
+	zeerex_explain.3mp \
+	zoom.3mp 
 
 HTMLFILES = index.html
 
@@ -91,14 +96,15 @@ metaproxyj.pdf: $(XMLFILES) multi.pdf
 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 $?
@@ -114,12 +120,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: