X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=doc%2FMakefile.am;h=a6a18f321c9bae74c1a4469aef27389913feb075;hb=14316ab7d2e8bf2415dff174e52e2601cd18aca5;hp=168ecbb1ba6ceab225798a5a1d9ff4af201546e8;hpb=1a8f4295eceae42c82160c88f50bb7d6fc7eadf0;p=metaproxy-moved-to-github.git

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 168ecbb..a6a18f3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,16 +1,15 @@
-## $Id: Makefile.am,v 1.20 2006-05-26 20:47:28 adam Exp $
+## $Id: Makefile.am,v 1.24 2006-06-10 14:32:19 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
 
 SUFFIXES=.3mp .1
 
-XMLFILES = main.xml.in book.xml manref.xml progref.xml copyright.xml \
-	metaproxy.xml
+XMLFILES = book.xml manref.xml progref.xml copyright.xml metaproxy.xml
 
-MAINXML = main.xml
+MAINXML = $(srcdir)/book.xml
 
-XMLMAN   = auth_simple.xml backend_test.xml frontend_net.xml \
+XMLMAN = auth_simple.xml backend_test.xml frontend_net.xml \
 	http_file.xml log.xml multi.xml query_rewrite.xml \
 	session_shared.xml template.xml virt_db.xml z3950_client.xml
 MANFILES = auth_simple.3mp backend_test.3mp frontend_net.3mp \
@@ -32,7 +31,7 @@ HTMLFILES = architecture.html \
 	installation.debian.html \
 	installation.windows.html \
 	introduction.html \
-	licence.html \
+	license.html \
 	multidb.html \
 	multidb.multi.html \
 	multidb.picture.html \
@@ -43,36 +42,36 @@ HTMLFILES = architecture.html \
 	overview.xml.structure.html \
 	refguide.html
 
-PNGFILES=multi.png
+PNGFILES = multi.png
 
-doc_DATA = $(HTMLFILES) metaproxy.pdf $(PNGFILES)
+doc_DATA = $(HTMLFILES) $(PNGFILES)
 man_MANS = $(MANFILES)
 
 EXTRA_DIST = $(XMLFILES) $(XMLMAN) $(doc_DATA) $(man_MANS) multi.svg
 
 $(HTMLFILES): $(XMLFILES) multi.png
-	xsltproc common/html.xsl $(MAINXML)
+	$(HTML_COMPILE) $(MAINXML)
 
 .xml.3mp:
-	xsltproc common/man.xsl $<
+	$(MAN_COMPILE) $<
 
 .xml.1:
-	xsltproc common/man.xsl $<
+	$(MAN_COMPILE) $<
+
+index.tkl: $(XMLFILES)
+	$(TKL_COMPILE) $(MAINXML)
 
 metaproxy.pdf: $(XMLFILES) multi.pdf
 	for i in $(PNGFILES) common/id.png multi.pdf; do \
-		if test ! -f $$i; then ln -s $(srcdir)/$$i $$i; fi; \
+		if test ! -f $$i; then cp $(srcdir)/$$i $$i; fi; \
 	done
 	jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(MAINXML)
 	rm -f metaproxy.tex
-	mv main.tex metaproxy.tex
+	mv book.tex metaproxy.tex
 	pdfjadetex metaproxy.tex >/dev/null
 	pdfjadetex metaproxy.tex >/dev/null
 	pdfjadetex metaproxy.tex >/dev/null
 
-index.tkl: $(XMLFILES) common/tkl.xsl
-	xsltproc common/tkl.xsl $(MAINXML)
-
 manref.xml: $(XMLMAN) $(srcdir)/common/ref2dbinc.xsl
 	rm -f manref.xml
 	for i in $(XMLMAN); do \
@@ -96,7 +95,7 @@ clean-data-hook:
 	rm -f [0-9]* *.bak
 
 dist-hook:
-	for f in $(srcdir)/*.html; do \
+	for f in *.html; do \
 		found=0; \
 		b=`basename $$f`; \
 		for h in $(HTMLFILES); do \