X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=doc%2FMakefile.am;h=8d7f4d2c0479f9d2e6960f0f89f54b9104a58bcf;hb=fac6320a7deabe9a288500c9c2145d948f916d2b;hp=2c88b6993f2373ca8052db58d06a18306a12d23c;hpb=4e6631d22200b35d25b3a91e0243347809ca70a2;p=metaproxy-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2c88b69..8d7f4d2 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,3 @@
-## $Id: Makefile.am,v 1.38 2007-01-31 11:16:57 adam Exp $
-docdir=$(datadir)/doc/@PACKAGE@
-
 SUBDIRS = common
 
 SUFFIXES=.3mp .1 .pdf .tkl .esp .xml 
@@ -40,7 +37,7 @@ MANFILES = metaproxy.1 \
 	multi.3mp query_rewrite.3mp \
         record_transform.3mp\
 	session_shared.3mp \
-        sru_z3950.xml\
+        sru_z3950.3mp \
 	template.3mp \
 	virt_db.3mp \
 	z3950_client.3mp \
@@ -76,7 +73,7 @@ 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
-	dblatex $(MAINXML)
+	$(PDF_COMPILE) $(MAINXML)
 	mv book.pdf metaproxy.pdf
 
 metaproxyj.pdf: $(XMLFILES) multi.pdf
@@ -96,10 +93,10 @@ manref.xml: $(XMLMAN) $(srcdir)/common/stripref.xsl
 	done
 
 multi.png: multi.svg
-	inkscape --export-png=$@ --export-area=0:0:1050:500 $?
+	unset DISPLAY; inkscape --export-png=$@ --export-area=0:0:1050:500 $?
 
 multi.eps: multi.svg
-	inkscape --export-eps=$@ --export-bbox-page $?
+	unset DISPLAY; inkscape --export-eps=$@ --export-bbox-page $?
 
 .eps.pdf:
 	epstopdf -hires $?
@@ -117,9 +114,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)