From 78d1f7d29145567e11b985042e917a435bef95f9 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 5 Jun 2011 16:27:37 -0400 Subject: 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 --- configure.ac | 2 +- docbook.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 66a7a97..3b38d29 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ XORG_ENABLE_DOCS XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP XORG_WITH_XSLTPROC -XORG_CHECK_SGML_DOCTOOLS(1.7) +XORG_CHECK_SGML_DOCTOOLS(1.8) # Because xtrans is included into other modules rather than being linked # with, these defines have to be added to the cflags line 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) -- cgit v1.2.1