libXmu: Branch 'master'

[Gaetan Nadon]

 configure.ac |    2 +-
 docbook.am   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a70bedc470f5482dc64b947057e5120c2f322177
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sun Jun 5 16:27:37 2011 -0400

    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

diff --git a/configure.ac b/configure.ac
index a665dbc..932a5c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,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)
 
 # Obtain compiler/linker options for depedencies
 PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
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)