Generate doc/local.ent via configure instead of doc/yazpp.xml.

Use {HTML,TKL,MAN}_COMPILE macros for documentation.

diff --git a/configure.ac b/configure.ac
index a46be3f..6c67c11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl yazproxy, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.9 2006-05-26 19:57:35 adam Exp $
+dnl $Id: configure.ac,v 1.10 2006-06-02 08:53:23 adam Exp $
 AC_PREREQ(2.59)
 AC_INIT([yazproxy],[1.2.1],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
@@ -64,7 +64,7 @@ AC_OUTPUT([
        include/Makefile
        include/yazproxy/Makefile
        doc/Makefile
-       doc/yazproxy.xml
+       doc/local.ent
        doc/common/Makefile
        doc/common/tkl.xsl doc/common/html.xsl doc/common/man.xsl 
        doc/common/print.dsl doc/common/html.dsl

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 25da5af..ee9a676 100644 (file)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,13 +1,9 @@
 *.log
 Makefile
 Makefile.in
-yazproxy.xml
-yazhtml.dsl
-yazphp.dsl
-yazprint.dsl
 *.html
-*.php
 *.tkl
+local.ent
 yazproxy.8
 yazproxy.tex
 yazproxy.log
@@ -16,5 +12,7 @@ yazproxy.out
 yazproxy.pdf
 manpage.links
 manpage.refs
-tkl.xsl
 html
+htmlhelp.hhp
+toc.hhc
+

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3b677a3..1d11d28 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.11 2006-05-26 19:59:58 adam Exp $
+## $Id: Makefile.am,v 1.12 2006-06-02 08:53:23 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
@@ -11,11 +11,11 @@ XMLFILES = \
  yaz-proxy-ref.xml \
  yaz-proxy-man.xml \
  license.xml \
- yazproxy.xml.in
+ yazproxy.xml
  
-TOP=yazproxy.xml
+TOP = $(srcdir)/yazproxy.xml
 
-MANFILES=yazproxy.8
+MANFILES = yazproxy.8
 
 HTMLFILES =  \
  installation.html \
@@ -43,13 +43,17 @@ doc_DATA = $(HTMLFILES)
 
 man_MANS = $(MANFILES)
 
-EXTRA_DIST = $(XMLFILES) $(doc_DATA) $(man_MANS) entities.ent
+EXTRA_DIST = $(XMLFILES) $(doc_DATA) $(man_MANS) entities.ent local.ent
 
 $(HTMLFILES): $(XMLFILES)
-       xsltproc common/html.xsl $(TOP)
+       $(HTML_COMPILE) $(TOP)
 
 yazproxy.8: yaz-proxy-man.xml yaz-proxy-ref.xml
-       xsltproc common/man.xsl $(srcdir)/yaz-proxy-man.xml
+       $(MAN_COMPILE) $(srcdir)/yaz-proxy-man.xml
+
+index.tkl: $(XMLFILES) common/tkl.xsl
+       $(TKL_COMPILE) $(TOP)
+
 
 yazproxy.pdf: $(XMLFILES)
        if test ! -f common/id.png ; then cp $(srcdir)/common/id.png common; fi
@@ -58,9 +62,6 @@ yazproxy.pdf: $(XMLFILES)
        pdfjadetex yazproxy.tex >pdfjadetex.log 2>&1
        pdfjadetex yazproxy.tex >pdfjadetex.log 2>&1
 
-index.tkl: $(XMLFILES) common/tkl.xsl
-       xsltproc common/tkl.xsl $(TOP)
-
 clean-data-hook:
        rm -f [0-9]* *.bak
 

diff --git a/doc/local.ent.in b/doc/local.ent.in
new file mode 100644 (file)
index 0000000..5ba670c
--- /dev/null
+++ b/doc/local.ent.in
@@ -0,0 +1,3 @@
+<!-- $Id: local.ent.in,v 1.1 2006-06-02 08:53:23 adam Exp $ -->
+<!ENTITY version "@VERSION@">
+<!ENTITY prefix "@prefix@">

diff --git a/doc/yazproxy.xml b/doc/yazproxy.xml
new file mode 100644 (file)
index 0000000..16df8ca
--- /dev/null
+++ b/doc/yazproxy.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
+    "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" 
+[
+     <!ENTITY % local SYSTEM "local.ent">
+     %local;
+     <!ENTITY % entities SYSTEM "entities.ent">
+     %entities;
+     <!ENTITY % common SYSTEM "common/common.ent">
+     %common;
+]>
+<!-- $Id: yazproxy.xml,v 1.1 2006-06-02 08:53:23 adam Exp $ -->
+<book id="yazproxy">
+ <bookinfo>
+  <title>YAZ proxy User's Guide and Reference</title>
+  <authorgroup>
+   <author><firstname>Mike</firstname><surname>Taylor</surname></author>
+   <author><firstname>Adam</firstname><surname>Dickmeiss</surname></author>
+   </authorgroup>
+  <copyright>
+   <year>1999-2006</year>
+   <holder>Index Data Aps</holder>
+  </copyright>
+  <abstract>
+   <simpara>
+    <ulink url="&url.yazproxy;">YAZ proxy</ulink>
+    is a powerful general purpose Z39.50/SRW/SRU proxy.
+   </simpara>
+   <simpara>
+    This manual covers version &version;.
+    </simpara>
+   <simpara>
+    CVS ID: $Id: yazproxy.xml,v 1.1 2006-06-02 08:53:23 adam Exp $
+   </simpara>
+   <simpara>
+    <inlinemediaobject>
+     <imageobject>
+      <imagedata fileref="common/id.png" format="PNG"/>
+     </imageobject>
+    </inlinemediaobject>
+   </simpara>
+  </abstract>
+ </bookinfo>
+ 
+ &chap-introduction;
+ &chap-installation;
+ &chap-using;
+ &chap-reference;
+ &app-license;
+</book>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-local-catalogs: nil
+sgml-namecase-general:t
+End:
+-->

diff --git a/doc/yazproxy.xml.in b/doc/yazproxy.xml.in
deleted file mode 100644 (file)
index 3d39dc2..0000000
--- a/doc/yazproxy.xml.in
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
-    "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" 
-[
-     <!ENTITY % entities  SYSTEM "@srcdir@/entities.ent">
-     %entities;
-     <!ENTITY % common  SYSTEM "@srcdir@/common/common.ent">
-     %common;
-]>
-<!-- $Id: yazproxy.xml.in,v 1.8 2006-05-26 19:57:35 adam Exp $ -->
-<book id="yazproxy">
- <bookinfo>
-  <title>YAZ proxy User's Guide and Reference</title>
-  <authorgroup>
-   <author><firstname>Mike</firstname><surname>Taylor</surname></author>
-   <author><firstname>Adam</firstname><surname>Dickmeiss</surname></author>
-   </authorgroup>
-  <copyright>
-   <year>1999-2006</year>
-   <holder>Index Data Aps</holder>
-  </copyright>
-  <abstract>
-   <simpara>
-    <ulink url="&url.yazproxy;">YAZ proxy</ulink>
-    is a powerful general purpose Z39.50/SRW/SRU proxy.
-   </simpara>
-   <simpara>
-    This manual covers version @VERSION@.
-    </simpara>
-   <simpara>
-    CVS ID: $Id: yazproxy.xml.in,v 1.8 2006-05-26 19:57:35 adam Exp $
-   </simpara>
-   <simpara>
-    <inlinemediaobject>
-     <imageobject>
-      <imagedata fileref="common/id.png" format="PNG"/>
-     </imageobject>
-    </inlinemediaobject>
-   </simpara>
-  </abstract>
- </bookinfo>
- 
- &chap-introduction;
- &chap-installation;
- &chap-using;
- &chap-reference;
- &app-license;
-</book>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-local-catalogs: nil
-sgml-namecase-general:t
-End:
--->