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

[Gaetan Nadon]

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

diff --git a/Makefile.am b/Makefile.am
index 527ce76..f463b75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,6 @@ EXTRA_DIST = \
 	specs/XKB/XKBlib/fonts.fm5 \
 	specs/XKB/XKBlib/title.fm5 \
 	specs/XKB/XKBlib/XKBlib.book \
-	specs/XLFD/xlfd.xml \
 	specs/Xserver/analysis.xml \
 	specs/Xserver/appgroup.xml \
 	specs/Xserver/secint.xml \
diff --git a/configure.ac b/configure.ac
index ea894bd..2fad865 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,5 +54,6 @@ AC_CONFIG_FILES([Makefile
 		 sgml/security/Makefile
 		 specs/Makefile
 		 specs/CTEXT/Makefile
-		 specs/ICCCM/Makefile])
+		 specs/ICCCM/Makefile
+		 specs/XLFD/Makefile])
 AC_OUTPUT
diff --git a/specs/Makefile.am b/specs/Makefile.am
index ba6980c..5d76939 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -21,4 +21,4 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-SUBDIRS=CTEXT ICCCM
+SUBDIRS=CTEXT ICCCM XLFD
diff --git a/specs/XLFD/Makefile.am b/specs/XLFD/Makefile.am
new file mode 100644
index 0000000..cab3bc4
--- /dev/null
+++ b/specs/XLFD/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 = xlfd.xml
+dist_spec_DATA = $(doc_sources)
+
+include $(top_srcdir)/specs/xmlrules.in
+
+endif ENABLE_SPECS
-- 
1.6.0.4