summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-06-05 16:27:36 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-06-11 19:49:23 -0400
commitb370eeb0191b0e2a8bde2f03a442a8ca62e35d58 (patch)
tree25b8d7ec6899e1c8c69976bdeef142a0b29baf35
parent4e741654b7e0a283779b8b4af5bb32e05b7fc678 (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 a39ab8d9..c085df37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ XORG_ENABLE_SPECS
XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP([no])
XORG_WITH_XSLTPROC
-XORG_CHECK_SGML_DOCTOOLS(1.7)
+XORG_CHECK_SGML_DOCTOOLS(1.8)
XORG_PROG_RAWCPP
# Required when PKG_CHECK_MODULES called within an if statement
diff --git a/docbook.am b/docbook.am
index 69370835..2ffb7e60 100644
--- a/docbook.am
+++ b/docbook.am
@@ -72,7 +72,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
@@ -94,4 +94,4 @@ endif HAVE_XSLTPROC
endif HAVE_STYLESHEETS
endif HAVE_XMLTO
-CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+CLEANFILES = $(shelf_DATA)