From 207705c3267eca038937df8a915e44b66b2ea711 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 30 May 2006 23:08:29 +0000 Subject: [PATCH] Let configure generate doc/local.ent rather than doc/zebra.xml . Update doc/Makefile.am to use _COMPILE definitions. --- configure.ac | 6 ++-- doc/.cvsignore | 2 +- doc/Makefile.am | 20 ++++++------ doc/local.ent.in | 3 ++ doc/zebra.xml | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/zebra.xml.in | 88 --------------------------------------------------- idzebra-config.in | 4 +-- 7 files changed, 109 insertions(+), 104 deletions(-) create mode 100644 doc/local.ent.in create mode 100644 doc/zebra.xml delete mode 100644 doc/zebra.xml.in diff --git a/configure.ac b/configure.ac index d62c2f0..be6ab5a 100644 --- 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 --- 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 --- 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 index 0000000..047ff33 --- /dev/null +++ b/doc/local.ent.in @@ -0,0 +1,3 @@ + + + diff --git a/doc/zebra.xml b/doc/zebra.xml new file mode 100644 index 0000000..7ff943f --- /dev/null +++ b/doc/zebra.xml @@ -0,0 +1,90 @@ + + + %local; + + %entities; + + %common; +]> + + + + Zebra - User's Guide and Reference + + AdamDickmeiss + + + HeikkiLevanto + + + MarcCromme + + + MikeTaylor + + + SebastianHammer + + + 1995-2006 + Index Data + + + + 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. + + + 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. + + + + + + + + + + + + + + + &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; + + + diff --git a/doc/zebra.xml.in b/doc/zebra.xml.in deleted file mode 100644 index 2ddc219..0000000 --- a/doc/zebra.xml.in +++ /dev/null @@ -1,88 +0,0 @@ - - - %entities; - - %common; -]> - - - - Zebra - User's Guide and Reference - - AdamDickmeiss - - - HeikkiLevanto - - - MarcCromme - - - MikeTaylor - - - SebastianHammer - - - 1995-2006 - Index Data - - - - 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. - - - 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. - - - - - - - - - - - - - - - &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; - - - diff --git a/idzebra-config.in b/idzebra-config.in index d4c0ce3..43e339c 100755 --- 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 -- 1.7.10.4