Using man COMPILE_HTML, COMPILE_MAN.. yaz.xml no longer generated

by configure - only local.ent is.

diff --git a/configure.ac b/configure.ac
index fce4b05..f05556e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl YAZ Toolkit, Index Data 1994-2006
 dnl See the file LICENSE for details.
-dnl $Id: configure.ac,v 1.18 2006-05-24 16:21:02 adam Exp $
+dnl $Id: configure.ac,v 1.19 2006-05-28 19:56:24 adam Exp $
 AC_PREREQ(2.59)
 AC_INIT([yaz],[2.1.19],[adam@indexdata.dk])
 AC_CONFIG_SRCDIR(configure.ac)
@@ -358,7 +358,7 @@ client/Makefile
 ztest/Makefile
 zoom/Makefile
 doc/Makefile
-doc/yaz.xml
+doc/local.ent
 doc/common/Makefile
 doc/common/html.dsl
 doc/common/html.xsl

diff --git a/doc/.cvsignore b/doc/.cvsignore
index 8da7d40..2abf94f 100644 (file)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,9 +1,5 @@
 Makefile
 Makefile.in
-yaz.xml
-yazhtml.dsl
-yazphp.dsl
-yazprint.dsl
 *.html
 yaz.tex
 yaz.aux
@@ -15,5 +11,7 @@ yaz.pdf
 manpage.links
 manpage.refs
 *.[178]
-tkl.xsl
-yazhtml.xsl
+local.ent
+htmlhelp.hhp
+toc.hhc
+

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e3aefe0..993a411 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,14 +1,14 @@
-## $Id: Makefile.am,v 1.69 2006-05-24 14:44:01 adam Exp $
+## $Id: Makefile.am,v 1.70 2006-05-28 19:56:24 adam Exp $
 
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
 
-XMLFILES=yaz.xml.in bookinfo.xml introduction.xml installation.xml \
+XMLFILES=bookinfo.xml introduction.xml installation.xml \
  indexdata.xml \
  asn.xml tools.xml odr.xml comstack.xml frontend.xml license.xml \
  future.xml client.xml zoom.xml credits.xml gfs-options.xml \
- yaz-client-commands.xml soap.xml gfs-virtual.xml gfs-synopsis.xml
+ yaz.xml yaz-client-commands.xml soap.xml gfs-virtual.xml gfs-synopsis.xml
 
 HTMLFILES = \
  asn.external.html asn.html asn.oid.html asn.pdu.html asn.preparing.html \
@@ -35,7 +35,7 @@ REFFILES=yaz-client-man.xml yaz-ztest-man.xml yaz-config-man.xml \
        yaz-man.xml zoomsh-man.xml yaz-asncomp-man.xml \
        yaz-marcdump-man.xml yaz-iconv-man.xml yaz-log-man.xml
 
-SUPPORTFILES=entities.ent apilayer.obj 
+SUPPORTFILES=entities.ent apilayer.obj local.ent.in
 
 doc_DATA = $(HTMLFILES) apilayer.png 
 man_MANS = $(MANFILES)
@@ -44,46 +44,46 @@ EXTRA_DIST = $(XMLFILES) $(SUPPORTFILES) $(man_MANS) $(REFFILES) \
        $(doc_DATA)
 
 yaz-client.1: $(srcdir)/yaz-client-man.xml $(srcdir)/yaz-client-commands.xml
-       xsltproc common/man.xsl $(srcdir)/yaz-client-man.xml
+       $(MAN_COMPILE) $(srcdir)/yaz-client-man.xml
 
 yaz-ztest.8: yaz-ztest-man.xml gfs-options.xml gfs-synopsis.xml gfs-virtual.xml
-       xsltproc common/man.xsl $(srcdir)/yaz-ztest-man.xml
+       $(MAN_COMPILE) $(srcdir)/yaz-ztest-man.xml
 
 yaz-config.8: yaz-config-man.xml
-       xsltproc common/man.xsl $(srcdir)/yaz-config-man.xml
+       $(MAN_COMPILE) $(srcdir)/yaz-config-man.xml
 
 yaz.7: yaz-man.xml
-       xsltproc common/man.xsl $(srcdir)/yaz-man.xml
+       $(MAN_COMPILE) $(srcdir)/yaz-man.xml
 
 zoomsh.1: zoomsh-man.xml
-       xsltproc common/man.xsl $(srcdir)/zoomsh-man.xml
+       $(MAN_COMPILE) $(srcdir)/zoomsh-man.xml
 
 yaz-asncomp.1: yaz-asncomp-man.xml
-       xsltproc common/man.xsl $(srcdir)/yaz-asncomp-man.xml
+       $(MAN_COMPILE) $(srcdir)/yaz-asncomp-man.xml
 
 yaz-marcdump.1: yaz-marcdump-man.xml
-       xsltproc common/man.xsl $(srcdir)/yaz-marcdump-man.xml
+       $(MAN_COMPILE) $(srcdir)/yaz-marcdump-man.xml
 
 yaz-iconv.1: yaz-iconv-man.xml
-       xsltproc common/man.xsl $(srcdir)/yaz-iconv-man.xml
+       $(MAN_COMPILE) $(srcdir)/yaz-iconv-man.xml
 
 yaz-log.7: yaz-log-man.xml
-       xsltproc common/man.xsl $(srcdir)/yaz-log-man.xml
+       $(MAN_COMPILE) $(srcdir)/yaz-log-man.xml
 
 $(HTMLFILES): $(XMLFILES)
-       xsltproc common/html.xsl yaz.xml
+       $(HTML_COMPILE) $(srcdir)/yaz.xml
+
+index.tkl: $(XMLFILES)
+       $(TKL_COMPILE) $(srcdir)/yaz.xml
 
 yaz.pdf: $(XMLFILES)
        if test ! -f common/id.png ; then cp $(srcdir)/common/id.png common; fi
        if test ! -f apilayer.png ; then cp $(srcdir)/apilayer.png .; fi
-       jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl yaz.xml
-       pdfjadetex yaz.tex >/dev/null
+       jade -E14 -D $(srcdir) -d common/print.dsl -t tex $(srcdir)/common/xml.dcl $(srcdir)/yaz.xml
+       pdfjadetex yaz.tex 
        pdfjadetex yaz.tex >/dev/null
        pdfjadetex yaz.tex >/dev/null
 
-index.tkl: $(XMLFILES) common/tkl.xsl
-       xsltproc common/tkl.xsl yaz.xml
-
 apilayer.png: 
        tgif -print -xbm apilayer.obj
        xbmtopbm <apilayer.xbm|pnmtopng >apilayer.png

diff --git a/doc/local.ent.in b/doc/local.ent.in
new file mode 100644 (file)
index 0000000..b7d3bb8
--- /dev/null
+++ b/doc/local.ent.in
@@ -0,0 +1,3 @@
+<!-- $Id: local.ent.in,v 1.1 2006-05-28 19:56:25 adam Exp $ -->
+<!ENTITY version "@VERSION@">
+<!ENTITY prefix "@prefix@">

diff --git a/doc/yaz-client-man.xml b/doc/yaz-client-man.xml
index 422dcae..6186110 100644 (file)
--- a/doc/yaz-client-man.xml
+++ b/doc/yaz-client-man.xml
@@ -1,11 +1,14 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" 
  "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd"
 [
-     <!ENTITY % common  SYSTEM "common/common.ent">
+     <!ENTITY % local SYSTEM "local.ent">
+     %local;
+     <!ENTITY % entities SYSTEM "entities.ent">
+     %entities;
+     <!ENTITY % common SYSTEM "common/common.ent">
      %common;
-     <!ENTITY yaz-client-commands SYSTEM "yaz-client-commands.xml">
 ]>
-<!-- $Id: yaz-client-man.xml,v 1.9 2006-05-24 12:33:21 adam Exp $ -->
+<!-- $Id: yaz-client-man.xml,v 1.10 2006-05-28 19:56:25 adam Exp $ -->
 <refentry id="yaz-client">
  
  <refmeta>

diff --git a/doc/yaz-man.xml b/doc/yaz-man.xml
index 093493d..aa438ac 100644 (file)
--- a/doc/yaz-man.xml
+++ b/doc/yaz-man.xml
@@ -1,10 +1,14 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" 
  "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd"
 [
-     <!ENTITY % common  SYSTEM "common/common.ent">
+     <!ENTITY % local SYSTEM "local.ent">
+     %local;
+     <!ENTITY % entities SYSTEM "entities.ent">
+     %entities;
+     <!ENTITY % common SYSTEM "common/common.ent">
      %common;
 ]>
-<!-- $Id: yaz-man.xml,v 1.8 2006-05-24 12:33:21 adam Exp $ -->
+<!-- $Id: yaz-man.xml,v 1.9 2006-05-28 19:56:25 adam Exp $ -->
 <refentry id="yaz">
  <refmeta>
   <refentrytitle>yaz</refentrytitle>
@@ -35,7 +39,7 @@
 
  <refsect1><title>COPYRIGHT</title>
   <para>
-   Copyright (c) 1995-2006, Index Data.
+   Copyright (c) &copyright-year;, Index Data.
   </para>
   <para>
    Permission to use, copy, modify, distribute, and sell this software and
@@ -86,7 +90,7 @@
     </citerefentry>
   </para>
   <para>YAZ manual (
-   <filename><replaceable>prefix</replaceable>/share/doc/yaz</filename>)
+   <filename>&prefix;/share/doc/yaz</filename>)
   </para>
   <para>
    <ulink url="&url.yaz;">YAZ home page</ulink>.

diff --git a/doc/yaz.xml b/doc/yaz.xml
new file mode 100644 (file)
index 0000000..a106071
--- /dev/null
+++ b/doc/yaz.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" standalone="no"?>
+<!-- $Id: yaz.xml,v 1.21 2006-05-28 19:56:25 adam Exp $ -->
+<!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;
+]>
+<book id="yaz">
+ &bookinfo; 
+ &chap-introduction;
+ &chap-installation;
+ &chap-zoom;
+ &chap-frontend;
+ &chap-client;
+ &chap-asn;
+ &chap-soap;
+ &chap-tools;
+ &chap-odr;
+ &chap-comstack;
+ &chap-future;
+ &app-license;
+ &app-indexdata;
+ &app-credits;
+</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/yaz.xml.in b/doc/yaz.xml.in
deleted file mode 100644 (file)
index 2216917..0000000
--- a/doc/yaz.xml.in
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!-- $Id: yaz.xml.in,v 1.24 2006-05-24 14:44:01 adam Exp $ -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1//EN"
-    "http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" 
-[
-     <!ENTITY version "@VERSION@">
-
-     <!ENTITY % entities  SYSTEM "@srcdir@/entities.ent">
-     %entities;
-     <!ENTITY % common  SYSTEM "@srcdir@/common/common.ent">
-     %common;
-]>
-<book id="yaz">
- &bookinfo; 
- &chap-introduction;
- &chap-installation;
- &chap-zoom;
- &chap-frontend;
- &chap-client;
- &chap-asn;
- &chap-soap;
- &chap-tools;
- &chap-odr;
- &chap-comstack;
- &chap-future;
- &app-license;
- &app-indexdata;
- &app-credits;
-</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:
--->