X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile.am;h=996be26c7b837e557891e52296675221e992b09d;hb=cd54d9cec3b4db6f3b39e7d506c7d88877d54fc7;hp=7362df49323d85ade6216a4f9414f3fcb970267b;hpb=d0123337d70b0fb97b578cc57467bb94980f1014;p=metaproxy-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7362df4..996be26 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
 
@@ -13,6 +15,7 @@ XMLMAN = metaproxy.xml \
         cql_rpn.xml \
 	frontend_net.xml \
 	http_file.xml \
+	limit.xml \
 	load_balance.xml \
 	log.xml \
 	multi.xml \
@@ -32,6 +35,7 @@ MANFILES = metaproxy.1 \
         cql_rpn.3mp \
         frontend_net.3mp \
 	http_file.3mp \
+	limit.3mp \
 	load_balance.3mp \
 	log.3mp \
 	multi.3mp query_rewrite.3mp \
@@ -92,11 +96,12 @@ manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl $(srcdir)/copyright.xml
 		xsltproc $(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 +117,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: