diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-04-08 20:53:36 -0700 |
|---|---|---|
| committer | matt <matt@matt-laptop.(none)> | 2011-04-09 10:43:26 -0600 |
| commit | 8332e65b816a9bd958c08e57eb6d9789a5b9ac0b (patch) | |
| tree | b3f7a5e0bf7546d41d71f2dcaa1c31beed9538ee | |
| parent | a0ad0d5c99023bb9a8ce3944dbc3267f5265721e (diff) | |
Install xml versions of specs even if HAVE_XMLTO is false
Moves HAVE_XMLTO check into docbook.am, more closely matches behaviour
from before docbook.am changes (commit e8c76407d2f6e3)
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | docbook.am | 2 | ||||
| -rw-r--r-- | specs/XIM/Makefile.am | 2 | ||||
| -rw-r--r-- | specs/XKB/Makefile.am | 2 | ||||
| -rw-r--r-- | specs/libX11/Makefile.am | 2 |
4 files changed, 2 insertions, 6 deletions
@@ -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) $(sgmldbs_DATA) diff --git a/specs/XIM/Makefile.am b/specs/XIM/Makefile.am index a1fa72d..68b0b3f 100644 --- a/specs/XIM/Makefile.am +++ b/specs/XIM/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = xim.xml @@ -21,5 +20,4 @@ shelfdir = $(docdir)/XIM # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/specs/XKB/Makefile.am b/specs/XKB/Makefile.am index 3939db6..90771cc 100644 --- a/specs/XKB/Makefile.am +++ b/specs/XKB/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = xkblib.xml @@ -59,5 +58,4 @@ shelfdir = $(docdir)/XKB # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am index 0e59ad8..c4de67e 100644 --- a/specs/libX11/Makefile.am +++ b/specs/libX11/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = libX11.xml @@ -36,5 +35,4 @@ shelfdir = $(docdir) # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS |