From: Adam Dickmeiss Date: Sun, 28 May 2006 19:56:24 +0000 (+0000) Subject: Using man COMPILE_HTML, COMPILE_MAN.. yaz.xml no longer generated X-Git-Tag: YAZ.2.1.20~12 X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=d775854eb4b203433c54239cc447f20511850ef9 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 --- 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 --- 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 --- 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.png diff --git a/doc/local.ent.in b/doc/local.ent.in new file mode 100644 index 0000000..b7d3bb8 --- /dev/null +++ b/doc/local.ent.in @@ -0,0 +1,3 @@ + + + diff --git a/doc/yaz-client-man.xml b/doc/yaz-client-man.xml index 422dcae..6186110 100644 --- a/doc/yaz-client-man.xml +++ b/doc/yaz-client-man.xml @@ -1,11 +1,14 @@ + + %local; + + %entities; + %common; - ]> - + diff --git a/doc/yaz-man.xml b/doc/yaz-man.xml index 093493d..aa438ac 100644 --- a/doc/yaz-man.xml +++ b/doc/yaz-man.xml @@ -1,10 +1,14 @@ + + %local; + + %entities; + %common; ]> - + yaz @@ -35,7 +39,7 @@ COPYRIGHT - Copyright (c) 1995-2006, Index Data. + Copyright (c) ©right-year;, Index Data. Permission to use, copy, modify, distribute, and sell this software and @@ -86,7 +90,7 @@ YAZ manual ( - prefix/share/doc/yaz) + &prefix;/share/doc/yaz) YAZ home page. diff --git a/doc/yaz.xml b/doc/yaz.xml new file mode 100644 index 0000000..a106071 --- /dev/null +++ b/doc/yaz.xml @@ -0,0 +1,44 @@ + + + + %local; + + %entities; + + %common; +]> + + &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; + + + diff --git a/doc/yaz.xml.in b/doc/yaz.xml.in deleted file mode 100644 index 2216917..0000000 --- a/doc/yaz.xml.in +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - %entities; - - %common; -]> - - &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; - - -