From 1c4537d44ca85d9f6c0c102983a1732d734858ee Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 5 Jun 2011 14:01:20 -0400 Subject: Masterdb: read the target dbs from the usual doc directory This is a coordinated change with the packages building DocBook/XML. The target dbs are now installed alongside the generated documents. Currently they are installed in $prefix/sgml/X11/dbs alongside masterdb which has the potential of installing outside the package prefix and cause distcheck to fail when user does not have write permission in this package. The master db xi:include statement is changed. It uses a fully qualified path but could also have used a relative path although it is difficult to ensure it would work reliably. The generated html/pdf link are still relative. The README elaborates on requirements which previously existed but were not introduced by this patch. Signed-off-by: Gaetan Nadon --- README | 7 +++ masterdb/Makefile.am | 12 +++-- masterdb/masterdb.xml | 126 +++++++++++++++++++++++++------------------------- 3 files changed, 78 insertions(+), 67 deletions(-) diff --git a/README b/README index 07e760b..e057938 100644 --- a/README +++ b/README @@ -64,6 +64,13 @@ configure option. For external references to work, it is assumed that the each package installs the documentation using the relative doc/${PACKAGE_TARNAME} location. +It is also a requirement that all packages containing DocBook/XML documentation +be installed under the same read-only architecture independent installation +directory as evidenced by the DATAROOTDIR package value. This value should also +be the same for the xorg-sgml-doctools package. The purpose of this requirement +is to form a document tree of a known structure such that stylesheets, +masterdb, target dbs and other files can be reached. + The Docbook stylesheet technology will create references with paths relative to this location. It will navigate up to "doc" using ../ and then navigate down to the document it refers to. diff --git a/masterdb/Makefile.am b/masterdb/Makefile.am index b967d68..4b8044d 100644 --- a/masterdb/Makefile.am +++ b/masterdb/Makefile.am @@ -11,16 +11,20 @@ CLEANFILES = $(sgmldbs_DATA) %.html.xml: %.xml $(AM_V_GEN)$(SED) -e 's|__ext__|html|g' \ - -e 's|__db__|html|g' < $< > $@ + -e 's|__db__|html|g' \ + -e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@ %.txt.xml: %.xml $(AM_V_GEN)$(SED) -e 's|__ext__|txt|g' \ - -e 's|__db__|html|g' < $< > $@ + -e 's|__db__|html|g' \ + -e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@ %.pdf.xml: %.xml $(AM_V_GEN)$(SED) -e 's|__ext__|pdf|g' \ - -e 's|__db__|fo|g' < $< > $@ + -e 's|__db__|fo|g' \ + -e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@ %.ps.xml: %.xml $(AM_V_GEN)$(SED) -e 's|__ext__|ps|g' \ - -e 's|__db__|fo|g' < $< > $@ + -e 's|__db__|fo|g' \ + -e 's|@datarootdir[@]|$(datarootdir)|g' < $< > $@ diff --git a/masterdb/masterdb.xml b/masterdb/masterdb.xml index 914f756..4860103 100644 --- a/masterdb/masterdb.xml +++ b/masterdb/masterdb.xml @@ -38,24 +38,24 @@ listed here. This allows crosslinking between documents. - + - + - + - + @@ -63,7 +63,7 @@ listed here. This allows crosslinking between documents. - + @@ -71,21 +71,21 @@ listed here. This allows crosslinking between documents. - + - + - + @@ -93,14 +93,14 @@ listed here. This allows crosslinking between documents. - + - + @@ -108,74 +108,74 @@ listed here. This allows crosslinking between documents. - + - + - + - + - + - + - + - + - + - + - + - + @@ -183,116 +183,116 @@ listed here. This allows crosslinking between documents. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -300,109 +300,109 @@ listed here. This allows crosslinking between documents. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -411,7 +411,7 @@ listed here. This allows crosslinking between documents. - + -- cgit v1.2.3