Removed / in doc install rule to avoid double-slash (cygwin)

[idzebra-moved-to-github.git] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index dac89fc..02260b6 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,4 @@
-## $Id: Makefile.am,v 1.69 2007-02-22 12:10:09 marc Exp $
-docdir=$(datadir)/doc/$(PACKAGE)$(PACKAGE_SUFFIX)
-
+## $Id: Makefile.am,v 1.74 2007-07-10 09:43:33 adam Exp $
 SUBDIRS = common
 
 XMLMAN = zebraidx.xml zebrasrv.xml idzebra-config.xml
@@ -26,11 +24,11 @@ XMLFILES =  \
    zebrasrv-synopsis.xml \
    zebrasrv-virtual.xml 
 
-HTMLFILES =  index.html
+HTMLFILES = index.html
 
-PNGFILES=zebra.png domfilter.png
-EPSFILES=zebra.eps domfilter.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 \
@@ -41,7 +39,7 @@ 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 +55,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,11 +99,11 @@ 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 $?