Let configure generate doc/local.ent rather than doc/zebra.xml .

Update doc/Makefile.am to use _COMPILE definitions.

diff --git a/configure.ac b/configure.ac
index d62c2f0..be6ab5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Zebra, Index Data ApS, 1995-2006
-dnl $Id: configure.ac,v 1.8 2006-05-24 19:12:46 adam Exp $
+dnl $Id: configure.ac,v 1.9 2006-05-30 23:08:29 adam Exp $
 dnl
 AC_PREREQ(2.59)
 AC_INIT([idzebra],[1.4.0],[adam@indexdata.dk])
@@ -34,7 +34,7 @@ else
 fi
 dnl
 dnl ------ YAZ
-YAZ_INIT($yazflag,2.1.9)
+YAZ_INIT($yazflag,2.1.19)
 YAZ_DOC
 dnl ----- libXSLT
 AC_SUBST(XSLT_LIBS)
@@ -350,7 +350,7 @@ AC_OUTPUT([
   include/Makefile include/idzebra/Makefile
   tab/Makefile
   doc/Makefile
-  doc/zebra.xml
+  doc/local.ent
   doc/common/Makefile
   doc/common/html.dsl
   doc/common/html.xsl

diff --git a/doc/.cvsignore b/doc/.cvsignore
index e3eb2fa..7ba19de 100644 (file)
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -1,11 +1,11 @@
 Makefile
 Makefile.in
-zebra.xml
 zebra.tex
 zebra.out
 zebra.log
 zebra.aux
 zebra.pdf
+local.ent
 manpage.links
 manpage.refs
 tkl.xsl

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7925b6d..8aa5487 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,9 @@
-## $Id: Makefile.am,v 1.45 2006-05-24 19:12:46 adam Exp $
+## $Id: Makefile.am,v 1.46 2006-05-30 23:08:29 adam Exp $
 docdir=$(datadir)/doc/@PACKAGE@
 
 SUBDIRS = common
 
-XMLFILES =  zebra.xml.in \
+XMLFILES =  zebra.xml \
    administration.xml \
    architecture.xml \
    examples.xml \
@@ -78,20 +78,23 @@ man_MANS = $(MANFILES)
 
 EXTRA_DIST = $(XMLFILES) $(REFFILES) \
        $(doc_DATA) $(EPSFILES) $(man_MANS) $(REFFILES) \
-       zvrank.txt marc_indexing.xml entities.ent
+       zvrank.txt marc_indexing.xml entities.ent local.ent.in
 
 zebraidx.1: zebraidx-man.xml zebraidx-options.xml zebraidx-commands.xml
-       xsltproc common/man.xsl $(srcdir)/zebraidx-man.xml
+       $(MAN_COMPILE) $(srcdir)/zebraidx-man.xml
 
 zebrasrv.8: zebrasrv-man.xml  zebrasrv-options.xml \
             zebrasrv-synopsis.xml zebrasrv-virtual.xml
-       xsltproc common/man.xsl $(srcdir)/zebrasrv-man.xml
+       $(MAN_COMPILE) $(srcdir)/zebrasrv-man.xml
 
 idzebra-config.1: idzebra-config-man.xml
-       xsltproc common/man.xsl $(srcdir)/idzebra-config-man.xml
+       $(MAN_COMPILE) $(srcdir)/idzebra-config-man.xml
 
 $(HTMLFILES): $(XMLFILES)
-       xsltproc common/html.xsl zebra.xml
+       $(HTML_COMPILE) $(srcdir)/zebra.xml
+
+index.tkl: $(XMLFILES) common/tkl.xsl
+       $(TKL_COMPILE) $(srcdir)/zebra.xml
 
 zebra.pdf: $(XMLFILES)
        for i in $(PNGFILES); do \
@@ -102,9 +105,6 @@ zebra.pdf: $(XMLFILES)
        pdfjadetex zebra.tex >/dev/null
        pdfjadetex zebra.tex >/dev/null
 
-index.tkl: $(XMLFILES) common/tkl.xsl
-       xsltproc common/tkl.xsl zebra.xml
-
 gils.txt: gils.sgml
        sgml2txt -f gils.sgml
 

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

diff --git a/doc/zebra.xml b/doc/zebra.xml
new file mode 100644 (file)
index 0000000..7ff943f
--- /dev/null
+++ b/doc/zebra.xml
@@ -0,0 +1,90 @@
+<?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: zebra.xml,v 1.5 2006-05-30 23:08:29 adam Exp $ -->
+<book id="zebra">
+ <bookinfo>
+  <title>Zebra - User's Guide and Reference</title>
+  <author>
+   <firstname>Adam</firstname><surname>Dickmeiss</surname>
+  </author>
+  <author>
+   <firstname>Heikki</firstname><surname>Levanto</surname>
+  </author>
+  <author>
+   <firstname>Marc</firstname><surname>Cromme</surname>
+  </author>
+  <author>
+   <firstname>Mike</firstname><surname>Taylor</surname>
+  </author>
+  <author>
+   <firstname>Sebastian</firstname><surname>Hammer</surname>
+  </author>
+  <copyright>
+   <year>1995-2006</year>
+   <holder>Index Data</holder>
+  </copyright>
+  <abstract>
+   <simpara>
+    Zebra is a free, fast, friendly information management system.  It
+    can index records in XML/SGML, MARC, e-mail archives and many
+    other formats, and quickly find them using a combination of
+    boolean searching and relevance ranking.  Search-and-retrieve
+    applications can be written using APIs in a wide variety of
+    languages, communicating with the Zebra server using
+    industry-standard information-retrieval protocols.
+   </simpara>
+   <simpara>
+    This manual explains how to build and install Zebra, configure it
+    appropriately for your application, add data and set up a running
+    information service.  It describes version &version; of Zebra.
+   </simpara>
+   <simpara>
+    <inlinemediaobject>
+     <imageobject>
+      <imagedata fileref="zebra.png" format="PNG"/>
+     </imageobject>
+     <imageobject>
+      <imagedata fileref="zebra.eps" format="EPS"/>
+     </imageobject>
+    </inlinemediaobject>
+   </simpara>
+  </abstract>
+ </bookinfo>
+ 
+  &chap-introduction;
+  &chap-installation;
+  &chap-quickstart;
+  &chap-examples;
+  &chap-architecture;
+  &chap-administration;
+  &chap-recordmodel-grs;
+  &chap-recordmodel-alvisxslt;
+  &chap-zebraidx;
+  &chap-server;
+  &app-license;
+  &app-indexdata;
+ 
+</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/zebra.xml.in b/doc/zebra.xml.in
deleted file mode 100644 (file)
index 2ddc219..0000000
--- a/doc/zebra.xml.in
+++ /dev/null
@@ -1,88 +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: zebra.xml.in,v 1.28 2006-05-24 19:12:46 adam Exp $ -->
-<book id="zebra">
- <bookinfo>
-  <title>Zebra - User's Guide and Reference</title>
-  <author>
-   <firstname>Adam</firstname><surname>Dickmeiss</surname>
-  </author>
-  <author>
-   <firstname>Heikki</firstname><surname>Levanto</surname>
-  </author>
-  <author>
-   <firstname>Marc</firstname><surname>Cromme</surname>
-  </author>
-  <author>
-   <firstname>Mike</firstname><surname>Taylor</surname>
-  </author>
-  <author>
-   <firstname>Sebastian</firstname><surname>Hammer</surname>
-  </author>
-  <copyright>
-   <year>1995-2006</year>
-   <holder>Index Data</holder>
-  </copyright>
-  <abstract>
-   <simpara>
-    Zebra is a free, fast, friendly information management system.  It
-    can index records in XML/SGML, MARC, e-mail archives and many
-    other formats, and quickly find them using a combination of
-    boolean searching and relevance ranking.  Search-and-retrieve
-    applications can be written using APIs in a wide variety of
-    languages, communicating with the Zebra server using
-    industry-standard information-retrieval protocols.
-   </simpara>
-   <simpara>
-    This manual explains how to build and install Zebra, configure it
-    appropriately for your application, add data and set up a running
-    information service.  It describes version @VERSION@ of Zebra.
-   </simpara>
-   <simpara>
-    <inlinemediaobject>
-     <imageobject>
-      <imagedata fileref="zebra.png" format="PNG"/>
-     </imageobject>
-     <imageobject>
-      <imagedata fileref="zebra.eps" format="EPS"/>
-     </imageobject>
-    </inlinemediaobject>
-   </simpara>
-  </abstract>
- </bookinfo>
- 
-  &chap-introduction;
-  &chap-installation;
-  &chap-quickstart;
-  &chap-examples;
-  &chap-architecture;
-  &chap-administration;
-  &chap-recordmodel-grs;
-  &chap-recordmodel-alvisxslt;
-  &chap-zebraidx;
-  &chap-server;
-  &app-license;
-  &app-indexdata;
- 
-</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/idzebra-config.in b/idzebra-config.in
index d4c0ce3..43e339c 100755 (executable)
--- a/idzebra-config.in
+++ b/idzebra-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: idzebra-config.in,v 1.6 2005-08-09 08:58:18 adam Exp $
+# $Id: idzebra-config.in,v 1.7 2006-05-30 23:08:29 adam Exp $
 prefix=@prefix@
 idzebra_echo_cflags=no
 idzebra_echo_libs=no
@@ -111,7 +111,7 @@ else
     fi
     IDZEBRALIB="$IDZEBRALIB $extralibs"
     IDZEBRALALIB="$IDZEBRALIB"
-    IDZEBRATAB="@datadir@/idzebra/tab"
+    IDZEBRATAB="@datarootdir@/idzebra/tab"
 fi
 
 if test "$idzebra_echo_help" = "yes"; then