[PATCH xserver] Install target dbs alongside generated documents

[Peter Hutterer]

On Thu, Jun 16, 2011 at 08:11:52PM -0400, Gaetan Nadon wrote:
> 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 <alan.coopersmith at oracle.com>
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  configure.ac |    2 +-
>  docbook.am   |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 22566c9..145e4c3 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 0a297dd..6902e98 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 @@ XSLTPROC_FLAGS =					\
>  endif HAVE_XSLTPROC
>  endif HAVE_STYLESHEETS
>  
> -CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
> +CLEANFILES = $(shelf_DATA)
> -- 
> 1.7.4.1

Merged, thanks.

   778309f..acf2173  master -> master

Cheers,
  Peter
>