summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-06-05 16:27:37 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-06-11 19:49:23 -0400
commit94f585af88a6486148ad6514f1f74eb83ce547ef (patch)
treedc20aa13c1efeaf9a3228b61033942d5a0d0b1a5
parent2d2581479c64b8b44ab91e90ecb04acd5d106ea2 (diff)
Install target dbs alongside generated documents
This matches a change in xorg-sgml-docs whereby the masterdb will look for the target dbs into the same location as the generated documents. The target dbs are now installed alongside the generated documents. Previously 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. Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
-rw-r--r--configure.ac2
-rw-r--r--docbook.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 7787a57..02cf034 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ XORG_ENABLE_SPECS
XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP
XORG_WITH_XSLTPROC
-XORG_CHECK_SGML_DOCTOOLS(1.7)
+XORG_CHECK_SGML_DOCTOOLS(1.8)
XORG_WITH_ASCIIDOC(8.4.5)
XORG_CHECK_MALLOC_ZERO
diff --git a/docbook.am b/docbook.am
index 3cf21e8..5864c9e 100644
--- a/docbook.am
+++ b/docbook.am
@@ -71,7 +71,7 @@ if HAVE_STYLESHEETS
if HAVE_XSLTPROC
# DocBook/XML generated document cross-reference database
-sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
# Generate DocBook/XML document cross-reference database
# Flags for the XSL Transformation processor generating xref target databases
@@ -92,4 +92,4 @@ XSLTPROC_FLAGS = \
endif HAVE_XSLTPROC
endif HAVE_STYLESHEETS
-CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+CLEANFILES = $(shelf_DATA)