diff options
Diffstat (limited to 'libXmu')
| -rw-r--r-- | libXmu/configure.ac | 2 | ||||
| -rw-r--r-- | libXmu/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | libXmu/docbook.am | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libXmu/configure.ac b/libXmu/configure.ac index 4381ed5b9..3f49d5d7d 100644 --- a/libXmu/configure.ac +++ b/libXmu/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/libXmu/doc/Makefile.am b/libXmu/doc/Makefile.am index 616e6bf83..cc0173248 100644 --- a/libXmu/doc/Makefile.am +++ b/libXmu/doc/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_DOCS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = Xmu.xml
@@ -14,5 +13,4 @@ shelfdir = $(docdir) # Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_DOCS
diff --git a/libXmu/docbook.am b/libXmu/docbook.am index 3cf21e879..2ffb7e60a 100644 --- a/libXmu/docbook.am +++ b/libXmu/docbook.am @@ -20,6 +20,7 @@ shelf_DATA = # DocBook/XML file with chapters, appendix and images it includes dist_shelf_DATA = $(docbook) $(chapters) +if HAVE_XMLTO # # Generate DocBook/XML output formats with or without stylesheets # @@ -71,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 @@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS +endif HAVE_XMLTO -CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +CLEANFILES = $(shelf_DATA) |