[PATCH xorg-docs 2/3] config: build ICCCM spec now in DocBook XML format

[Gaetan Nadon]

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am             |    1 -
 configure.ac            |    3 ++-
 specs/ICCCM/Makefile.am |   32 ++++++++++++++++++++++++++++++++
 specs/Makefile.am       |    2 +-
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 specs/ICCCM/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 36423a0..527ce76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ EXTRA_DIST = \
 	specs/BDF/bdf.ms \
 	specs/BDF/fig1.ps \
 	specs/BDF/fig2.ps \
-	specs/ICCCM/icccm.xml \
 	specs/RX/RX.mif \
 	specs/SIAddresses/hostname.txt \
 	specs/SIAddresses/IPv6.txt \
diff --git a/configure.ac b/configure.ac
index 80374bb..ea894bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,5 +53,6 @@ AC_CONFIG_FILES([Makefile
 		 sgml/platforms/Makefile
 		 sgml/security/Makefile
 		 specs/Makefile
-		 specs/CTEXT/Makefile])
+		 specs/CTEXT/Makefile
+		 specs/ICCCM/Makefile])
 AC_OUTPUT
diff --git a/specs/ICCCM/Makefile.am b/specs/ICCCM/Makefile.am
new file mode 100644
index 0000000..5c99c57
--- /dev/null
+++ b/specs/ICCCM/Makefile.am
@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+
+if ENABLE_SPECS
+
+specdir = $(docdir)/$(subdir)
+doc_sources = icccm.xml
+dist_spec_DATA = $(doc_sources)
+
+include $(top_srcdir)/specs/xmlrules.in
+
+endif ENABLE_SPECS
diff --git a/specs/Makefile.am b/specs/Makefile.am
index dd48065..ba6980c 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -21,4 +21,4 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-SUBDIRS=CTEXT
+SUBDIRS=CTEXT ICCCM
-- 
1.6.0.4