From 44890b3e266116ae71bfca2590e5fd9cdfbdb69b Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Thu, 16 Jun 2011 20:11:52 -0400 Subject: [PATCH] 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 Reviewed-by: Alan Coopersmith Signed-off-by: Gaetan Nadon Signed-off-by: Peter Hutterer --- configure.ac | 2 +- docbook.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 22566c9ef4..145e4c32c0 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.14) XORG_DEFAULT_OPTIONS XORG_WITH_DOXYGEN(1.6.1) -XORG_CHECK_SGML_DOCTOOLS(1.7) +XORG_CHECK_SGML_DOCTOOLS(1.8) XORG_ENABLE_DOCS XORG_ENABLE_DEVEL_DOCS XORG_WITH_XMLTO(0.0.20) diff --git a/docbook.am b/docbook.am index 7ab7a00500..3af09f3542 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 @@ -93,4 +93,4 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS -CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +CLEANFILES = $(shelf_DATA)