X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile.am;h=c678466723e6e9fb7bc16b006134df084460010f;hb=9d9266bfed4daa001a3f038f0d5b6e8c51a37373;hp=a81a3ec58af3c2117cf4ef4753a6117b7bc5ded2;hpb=3e61994433eac158b5d087f3cedaddaf03b06620;p=idzebra-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a81a3ec..c678466 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.52 2006-06-28 13:26:13 adam Exp $
+## $Id: Makefile.am,v 1.57 2006-08-14 19:33:38 adam Exp $
 docdir=$(datadir)/doc/$(PACKAGE)$(PACKAGE_SUFFIX)
 
 SUBDIRS = common
@@ -32,7 +32,6 @@ HTMLFILES =  \
    administration-extended-services.html \
    administration-ranking.html \
    administration.html \
-   apps.html \
    architecture-maincomponents.html \
    architecture-workflow.html \
    architecture.html \
@@ -49,10 +48,12 @@ HTMLFILES =  \
    grs-internal-representation.html \
    index.html \
    indexdata.html \
+   installation-upgrade.html \
    installation.debian.html \
    installation.html \
    installation.win32.html \
-   installation-upgrade.html \
+   introduction-apps.html \
+   introduction-support.html \
    introduction.html \
    license.html \
    locating-records.html \
@@ -72,7 +73,6 @@ HTMLFILES =  \
    server.html \
    shadow-registers.html \
    simple-indexing.html \
-   support.html \
    zebraidx.html \
    htmlhelp.hhp \
    toc.hhc 
@@ -83,7 +83,7 @@ EPSFILES=zebra.eps
 
 MANFILES=zebraidx$(PACKAGE_SUFFIX).1 \
 	zebrasrv$(PACKAGE_SUFFIX).8 \
-	idzebra-config.1
+	idzebra-config$(PACKAGE_SUFFIX).1
 
 REFFILES=zebraidx-man.xml zebrasrv-man.xml idzebra-config-man.xml
 
@@ -103,13 +103,14 @@ zebrasrv$(PACKAGE_SUFFIX).8: zebrasrv-man.xml  zebrasrv-options.xml \
 	$(MAN_COMPILE) $(srcdir)/zebrasrv-man.xml
 	mv zebrasrv.8 zebrasrv$(PACKAGE_SUFFIX).8
 
-idzebra-config.1: idzebra-config-man.xml
+idzebra-config$(PACKAGE_SUFFIX).1: idzebra-config-man.xml
 	$(MAN_COMPILE) $(srcdir)/idzebra-config-man.xml
+	mv idzebra-config.1 idzebra-config$(PACKAGE_SUFFIX).1
 
 $(HTMLFILES): $(XMLFILES)
 	$(HTML_COMPILE) $(srcdir)/zebra.xml
 
-index.tkl: $(XMLFILES) common/tkl.xsl
+index.tkl: $(XMLFILES)
 	$(TKL_COMPILE) $(srcdir)/zebra.xml
 
 zebra.pdf: $(XMLFILES)
@@ -134,7 +135,7 @@ clean-data-hook:
 	rm -f [0-9]* *.bak
 
 dist-hook:
-	for f in *.html; do \
+	if test -f index.html; then for f in *.html; do \
 		found=0; \
 		b=`basename $$f`; \
 		for h in $(HTMLFILES); do \
@@ -146,8 +147,9 @@ dist-hook:
 			echo "$$f not found in HTMLFILES"; \
 			exit 1; \
 		fi \
-	done
+	done; fi
 
 install-data-hook:
-	cd $(man1dir) && ln -sf zebraidx$(PACKAGE_SUFFIX).1 zebraidx.1
-	cd $(man8dir) && ln -sf zebrasrv$(PACKAGE_SUFFIX).8 zebrasrv.8
+	cd $(DESTDIR)$(man1dir) && ln -sf zebraidx$(PACKAGE_SUFFIX).1 zebraidx.1
+	cd $(DESTDIR)$(man8dir) && ln -sf zebrasrv$(PACKAGE_SUFFIX).8 zebrasrv.8
+	cd $(DESTDIR)$(man1dir) && ln -sf idzebra-config$(PACKAGE_SUFFIX).1 idzebra-config.1