From 9a1ae7a90f815a737a942e42d5eb1ffff400977b Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 8 Apr 2011 13:24:28 -0700 Subject: 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 Reviewed-by: Gaetan Nadon --- specs/XIM/Makefile.am | 2 -- specs/XKB/Makefile.am | 2 -- specs/i18n/framework/Makefile.am | 2 -- specs/i18n/localedb/Makefile.am | 2 -- specs/i18n/trans/Makefile.am | 2 -- specs/libX11/Makefile.am | 2 -- 6 files changed, 12 deletions(-) (limited to 'specs') diff --git a/specs/XIM/Makefile.am b/specs/XIM/Makefile.am index a1fa72da..68b0b3f4 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 3939db6a..90771cc0 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/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am index 6e8b0106..350b7df6 100644 --- a/specs/i18n/framework/Makefile.am +++ b/specs/i18n/framework/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = framework.xml @@ -14,5 +13,4 @@ shelfdir = $(docdir)/framework # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am index 8db6a7bd..0c52a13a 100644 --- a/specs/i18n/localedb/Makefile.am +++ b/specs/i18n/localedb/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = localedb.xml @@ -11,5 +10,4 @@ shelfdir = $(docdir)/localedb # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am index cdec7509..6e4baf14 100644 --- a/specs/i18n/trans/Makefile.am +++ b/specs/i18n/trans/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = trans.xml @@ -11,5 +10,4 @@ shelfdir = $(docdir)/trans # 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 0e59ad88..c4de67e5 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 -- cgit v1.2.1