X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=doc%2FMakefile.am;h=3a1126c5070aa70a854cfd284f8fbcd7411b6efd;hb=0ab6e8aba7de1ea5cf109de175f56c9d8f7f49bc;hp=e0eadb379ce806ff79fbd1255c66dc18c68020b6;hpb=e5901333c8011101505ee1a283df326663637a7e;p=metaproxy-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e0eadb3..3a1126c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,4 @@
-## $Id: Makefile.am,v 1.34 2007-01-05 10:56:17 marc Exp $
-docdir=$(datadir)/doc/@PACKAGE@
-
+## $Id: Makefile.am,v 1.40 2007-07-10 09:43:06 adam Exp $
 SUBDIRS = common
 
 SUFFIXES=.3mp .1 .pdf .tkl .esp .xml 
@@ -13,6 +11,7 @@ XMLMAN = metaproxy.xml \
 	auth_simple.xml \
 	backend_test.xml \
 	bounce.xml \
+        cql_rpn.xml \
 	frontend_net.xml \
 	http_file.xml \
 	load_balance.xml \
@@ -31,6 +30,7 @@ MANFILES = metaproxy.1 \
 	auth_simple.3mp \
 	backend_test.3mp  \
 	bounce.3mp \
+        cql_rpn.3mp \
         frontend_net.3mp \
 	http_file.3mp \
 	load_balance.3mp \
@@ -74,12 +74,18 @@ metaproxy.pdf: $(XMLFILES) multi.pdf
 	for i in $(PNGFILES) common/id.png multi.pdf; do \
 		if test ! -f $$i; then cp $(srcdir)/$$i $$i; fi; \
 	done
-	jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(MAINXML)
-	rm -f metaproxy.tex
-	mv book.tex metaproxy.tex
-	pdfjadetex metaproxy.tex >/dev/null
-	pdfjadetex metaproxy.tex >/dev/null
-	pdfjadetex metaproxy.tex >/dev/null
+	dblatex $(MAINXML)
+	mv book.pdf metaproxy.pdf
+
+metaproxyj.pdf: $(XMLFILES) multi.pdf
+	for i in $(PNGFILES) common/id.png multi.pdf; do \
+		if test ! -f $$i; then cp $(srcdir)/$$i $$i; fi; \
+	done
+	jade  -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(MAINXML)
+	pdfjadetex book.tex
+	pdfjadetex book.tex
+	pdfjadetex book.tex
+	mv book.pdf metaproxyj.pdf
 
 manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl
 	rm -f manref.xml
@@ -88,7 +94,7 @@ manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl
 	done
 
 multi.png: multi.svg
-	inkscape --export-png=$@ --export-width=800 --export-area-drawing $?
+	inkscape --export-png=$@ --export-area=0:0:1050:500 $?
 
 multi.eps: multi.svg
 	inkscape --export-eps=$@ --export-bbox-page $?
@@ -109,9 +115,9 @@ dist-hook:
 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); \
+		$(docDATA_INSTALL) $$p $(DESTDIR)$(docdir); \
 	done
 
 uninstall-hook:
-	rm -r $(DESTDIR)/$(docdir)
+	rm -r $(DESTDIR)$(docdir)