X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=doc%2FMakefile.am;h=8d315ae566cd5d80c247ef79800171ee0100f5bb;hp=778b1cc793f71192484540d854e78fcea33c204c;hb=8785cf4f0724a75a71b76c418a5f83a1192c0955;hpb=2b32f605f4c8385347cbc44c2dd7f8a188f7470f

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 778b1cc..8d315ae 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,3 @@
-## $Id: Makefile.am,v 1.75 2008-01-18 12:39:35 adam Exp $
 SUBDIRS = common
 
 docdir=$(datadir)/doc/$(PACKAGE)$(PACKAGE_SUFFIX)
@@ -8,30 +7,31 @@ XMLMAN = zebraidx.xml zebrasrv.xml idzebra-config.xml
 XMLFILES =  \
    administration.xml \
    architecture.xml \
-   examples.xml \
    field-structure.xml \
+   gpl-2.0.xml \
    indexdata.xml \
    installation.xml \
    introduction.xml \
    license.xml \
    marc_indexing.xml \
    querymodel.xml \
-   quickstart.xml \
    recordmodel-domxml.xml \
    recordmodel-alvisxslt.xml \
    recordmodel-grs.xml \
    manref.xml \
-   zebra.xml \
+   tutorial.xml \
+   idzebra.xml \
    zebrasrv-options.xml \
    zebrasrv-synopsis.xml \
    zebrasrv-virtual.xml 
 
+#examples.xml 
+#quickstart.xml
+
+
 HTMLFILES = index.html
 
 PNGFILES = zebra.png domfilter.png
-EPSFILES = zebra.eps domfilter.eps
-PDFFILES = zebra.pdf domfilter.pdf
-
 
 MANFILES=zebraidx$(PACKAGE_SUFFIX).1 \
 	zebrasrv$(PACKAGE_SUFFIX).8 \
@@ -59,17 +59,13 @@ idzebra-config$(PACKAGE_SUFFIX).1: idzebra-config.xml
 
 $(HTMLFILES): $(XMLFILES) $(PNGFILES)
 	rm -f *.html
-	$(HTML_COMPILE) $(srcdir)/zebra.xml
+	$(HTML_COMPILE) $(srcdir)/idzebra.xml
 
-index.tkl: $(XMLFILES)
-	rm -f *.tkl
-	$(TKL_COMPILE) $(srcdir)/zebra.xml
-
-zebra.pdf: $(XMLFILES) domfilter.pdf
+idzebra.pdf: $(XMLFILES) domfilter.pdf
 	for i in $(PNGFILES); do \
 		if test ! -f $$i; then cp $(srcdir)/$$i .; fi; \
 	done
-	dblatex $(srcdir)/zebra.xml
+	$(PDF_COMPILE) $(srcdir)/idzebra.xml
 
 manref.xml: $(XMLMAN) $(srcdir)/common/ref2dbinc.xsl
 	rm -f manref.xml
@@ -101,17 +97,20 @@ 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); \
+		$(INSTALL_DATA) $$p $(DESTDIR)$(docdir); \
 	done
 
 uninstall-hook:
 	rm -r $(DESTDIR)$(docdir)
 
 domfilter.png: domfilter.svg
-	inkscape --export-png=$@ --export-width=600 $?
+	unset DISPLAY; inkscape --export-png=$@ --export-width=600 $?
 
 domfilter.eps: domfilter.svg
-	inkscape --export-eps=$@ --export-bbox-page $?
+	unset DISPLAY; inkscape --export-eps=$@ $?
+
+doc-clean:
+	rm -f manref.xml *.html *.pdf *.[0-9] domfilter.png domfilter.eps
 
 .eps.pdf:
 	epstopdf -hires $?