X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=doc%2FMakefile.am;h=e1744c5e5fb561a99d69cb8bfcf65cb87f1304a2;hb=09ce8a48eb9d2947cd019f9b8adb6513941c2211;hp=2c88b6993f2373ca8052db58d06a18306a12d23c;hpb=4e6631d22200b35d25b3a91e0243347809ca70a2;p=metaproxy-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2c88b69..e1744c5 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 
@@ -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)