X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile.am;h=03e48983c8a10d2fdfee514086ed9550235e095a;hb=d5170943ca365ace791c3254db15cc852df56d6b;hp=068c69f37a5c732dfd1fa2a10fbfa6f5927d9c42;hpb=28d0fdb9253a14f8117b5c26ea0aed73ba9d16a7;p=idzebra-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 068c69f..03e4898 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,14 +1,12 @@
-## $Id: Makefile.am,v 1.67 2007-02-21 17:03:23 adam Exp $
-docdir=$(datadir)/doc/$(PACKAGE)$(PACKAGE_SUFFIX)
-
 SUBDIRS = common
 
+docdir=$(datadir)/doc/$(PACKAGE)$(PACKAGE_SUFFIX)
+
 XMLMAN = zebraidx.xml zebrasrv.xml idzebra-config.xml
 
 XMLFILES =  \
    administration.xml \
    architecture.xml \
-   examples.xml \
    field-structure.xml \
    indexdata.xml \
    installation.xml \
@@ -16,7 +14,6 @@ XMLFILES =  \
    license.xml \
    marc_indexing.xml \
    querymodel.xml \
-   quickstart.xml \
    recordmodel-domxml.xml \
    recordmodel-alvisxslt.xml \
    recordmodel-grs.xml \
@@ -26,22 +23,26 @@ XMLFILES =  \
    zebrasrv-synopsis.xml \
    zebrasrv-virtual.xml 
 
-HTMLFILES =  index.html
+#examples.xml 
+#quickstart.xml
+
+
+HTMLFILES = index.html
 
-PNGFILES=zebra.png domfilter.png
-EPSFILES=zebra.eps
-PDFFILES=zebra.pdf domfilter.pdf
+PNGFILES = zebra.png domfilter.png
+EPSFILES = zebra.eps domfilter.eps
+PDFFILES = zebra.pdf domfilter.pdf
 
 
 MANFILES=zebraidx$(PACKAGE_SUFFIX).1 \
 	zebrasrv$(PACKAGE_SUFFIX).8 \
 	idzebra-config$(PACKAGE_SUFFIX).1
 
-doc_DATA = $(HTMLFILES) $(PNGFILES) $(PDFFILES)
+doc_DATA = $(HTMLFILES) $(PNGFILES)
 man_MANS = $(MANFILES)
 
 EXTRA_DIST = $(XMLFILES) $(XMLMAN) \
-	$(doc_DATA) $(EPSFILES) $(man_MANS) \
+	$(doc_DATA) zebra.eps $(man_MANS) \
 	marc_indexing.xml entities.ent local.ent.in domfilter.svg
 
 zebraidx$(PACKAGE_SUFFIX).1: zebraidx.xml
@@ -57,7 +58,7 @@ idzebra-config$(PACKAGE_SUFFIX).1: idzebra-config.xml
 	$(MAN_COMPILE) $(srcdir)/idzebra-config.xml
 	mv idzebra-config.1 idzebra-config$(PACKAGE_SUFFIX).1
 
-$(HTMLFILES): $(XMLFILES)
+$(HTMLFILES): $(XMLFILES) $(PNGFILES)
 	rm -f *.html
 	$(HTML_COMPILE) $(srcdir)/zebra.xml
 
@@ -101,17 +102,17 @@ install-data-hook:
 	cd $(DESTDIR)$(man1dir) && ln -sf idzebra-config$(PACKAGE_SUFFIX).1 idzebra-config.1
 	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)
 
 domfilter.png: domfilter.svg
-	inkscape --export-png=$@ --export-width=600 --export-area-drawing $?
+	unset DISPLAY; inkscape --export-png=$@ --export-width=600 $?
 
 domfilter.eps: domfilter.svg
-	inkscape --export-eps=$@ --export-bbox-page $?
+	unset DISPLAY; inkscape --export-eps=$@ --export-bbox-page $?
 
 .eps.pdf:
 	epstopdf -hires $?