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
commitb6fc6e6a0784b747863ee9b586fb09a81340bea4 (patch)
treeb7509a350a30780d7f16582a63c5c59126c48ce3
parentacc529ed1f1cff6c79d3b6f711ff64da97bb864c (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 79fb39c..6e6cc8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,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_CHECK_MALLOC_ZERO
# Determine .so library version per platform
diff --git a/docbook.am b/docbook.am
index 6937083..2ffb7e6 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)