libXmu: Branch 'master'

Gaetan Nadon gnadon at kemper.freedesktop.org
Mon Jun 13 04:45:01 PDT 2011


 doc/Makefile.am |    2 --
 docbook.am      |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 08fb51c1db9c9693125f4c093d07abc94d6ce0f6
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Sun Jun 12 18:39:46 2011 -0400

    Install xml versions of specs even if HAVE_XMLTO is false
    
    DocBook/XML input source is also a usefull output format that can be viewed
    with an XML viewer or editor and by some O/S help system.
    
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>

diff --git a/doc/Makefile.am b/doc/Makefile.am
index a8363ca..11a2fe1 100644
--- a/doc/Makefile.am
+++ b/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/docbook.am b/docbook.am
index 5864c9e..2ffb7e6 100644
--- a/docbook.am
+++ b/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
 #
@@ -91,5 +92,6 @@ XSLTPROC_FLAGS =					\
 
 endif HAVE_XSLTPROC
 endif HAVE_STYLESHEETS
+endif HAVE_XMLTO
 
 CLEANFILES = $(shelf_DATA)


More information about the xorg-commit mailing list