summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-06-12 17:54:50 -0400
committerGaetan Nadon <memsize@videotron.ca>2011-06-12 20:23:28 -0400
commitfded76132037c79cccff94fe6152172962892919 (patch)
tree2b11917bd5a9a0afc908ca763ab77a2c913b895f
parent64927512449c6460d65a6b826d3814a549162fce (diff)
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@videotron.ca>
-rw-r--r--docbook.am2
-rw-r--r--general/Makefile.am2
-rw-r--r--general/fonts/Makefile.am2
-rw-r--r--general/graphics/Makefile.am2
-rw-r--r--general/input/Makefile.am2
-rw-r--r--general/platforms/Makefile.am2
-rw-r--r--specs/CTEXT/Makefile.am2
-rw-r--r--specs/ICCCM/Makefile.am2
-rw-r--r--specs/XLFD/Makefile.am2
-rw-r--r--specs/Xext/Makefile.am2
-rw-r--r--specs/Xserver/Makefile.am2
11 files changed, 2 insertions, 20 deletions
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)
diff --git a/general/Makefile.am b/general/Makefile.am
index cddb7e1..2ba8598 100644
--- a/general/Makefile.am
+++ b/general/Makefile.am
@@ -2,7 +2,6 @@
SUBDIRS = fonts input graphics platforms
if ENABLE_DOCS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = \
@@ -17,5 +16,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/general/fonts/Makefile.am b/general/fonts/Makefile.am
index d7f0944..4300cb7 100644
--- a/general/fonts/Makefile.am
+++ b/general/fonts/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_DOCS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = fonts.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)/fonts
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_DOCS
diff --git a/general/graphics/Makefile.am b/general/graphics/Makefile.am
index 80cb437..f90450d 100644
--- a/general/graphics/Makefile.am
+++ b/general/graphics/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_DOCS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = dps.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)/graphics
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_DOCS
diff --git a/general/input/Makefile.am b/general/input/Makefile.am
index 5133f68..5653367 100644
--- a/general/input/Makefile.am
+++ b/general/input/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_DOCS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = XKB-Config.xml XKB-Enhancing.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)/input
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_DOCS
diff --git a/general/platforms/Makefile.am b/general/platforms/Makefile.am
index ee6c806..858e26d 100644
--- a/general/platforms/Makefile.am
+++ b/general/platforms/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_DOCS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = Darwin.xml Solaris.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)/platforms
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_DOCS
diff --git a/specs/CTEXT/Makefile.am b/specs/CTEXT/Makefile.am
index f4a1a90..43847e0 100644
--- a/specs/CTEXT/Makefile.am
+++ b/specs/CTEXT/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = ctext.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)/ctext
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/specs/ICCCM/Makefile.am b/specs/ICCCM/Makefile.am
index 9e1fc34..168232c 100644
--- a/specs/ICCCM/Makefile.am
+++ b/specs/ICCCM/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = icccm.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)/icccm
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/specs/XLFD/Makefile.am b/specs/XLFD/Makefile.am
index 73cd69c..b719a86 100644
--- a/specs/XLFD/Makefile.am
+++ b/specs/XLFD/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = xlfd.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)/xlfd
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/specs/Xext/Makefile.am b/specs/Xext/Makefile.am
index 1133dfe..f9c4253 100644
--- a/specs/Xext/Makefile.am
+++ b/specs/Xext/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = lbxalg.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)/xext
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/specs/Xserver/Makefile.am b/specs/Xserver/Makefile.am
index 71d486f..68f7015 100644
--- a/specs/Xserver/Makefile.am
+++ b/specs/Xserver/Makefile.am
@@ -1,6 +1,5 @@
if ENABLE_SPECS
-if HAVE_XMLTO
# Main DocBook/XML files (DOCTYPE book)
docbook = analysis.xml appgroup.xml secint.xml XACE-Spec.xml
@@ -11,5 +10,4 @@ shelfdir = $(docdir)/Xserver
# Generate DocBook/XML output formats with or without stylesheets
include $(top_srcdir)/docbook.am
-endif HAVE_XMLTO
endif ENABLE_SPECS