diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-06-16 20:11:52 -0400 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-06-20 08:41:49 +1000 |
| commit | 44890b3e266116ae71bfca2590e5fd9cdfbdb69b (patch) | |
| tree | 502cb89d02c888121932020bde39bacea7bcc8f4 | |
| parent | a42ef6c940604172e54de110b7d989cb2208f7ef (diff) | |
| download | xserver-44890b3e266116ae71bfca2590e5fd9cdfbdb69b.tar.gz | |
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 <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | docbook.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 22566c9ef..145e4c32c 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 7ab7a0050..3af09f354 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) |