[PATCH xorg-docs] XACE spec: move from sgml/security to specs/Xserver directory

[Gaetan Nadon]

This spec is a DocBook XML despite its sgml file extension.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---

 Makefile.am                  |    5 +-
 configure.ac                 |    4 +-
 sgml/Makefile.am             |    2 +-
 sgml/security/Makefile.am    |    5 -
TRUNCATED: sgml/security/XACE-Spec.sgml | 1040 ------------------------------------------
 specs/Makefile.am            |    2 +-
 specs/Xserver/Makefile.am    |    9 +
TRUNCATED:  specs/Xserver/XACE-Spec.xml  | 1040 ++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 1054 insertions(+), 1053 deletions(-)
 delete mode 100644 sgml/security/Makefile.am
 delete mode 100644 sgml/security/XACE-Spec.sgml
 create mode 100644 specs/Xserver/Makefile.am
 create mode 100644 specs/Xserver/XACE-Spec.xml

diff --git a/Makefile.am b/Makefile.am
index f261dcc..29eaf0c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,10 +60,7 @@ EXTRA_DIST = \
 	specs/XKB/XKBlib/allchaps.toc \
 	specs/XKB/XKBlib/fonts.fm5 \
 	specs/XKB/XKBlib/title.fm5 \
-	specs/XKB/XKBlib/XKBlib.book \
-	specs/Xserver/analysis.xml \
-	specs/Xserver/appgroup.xml \
-	specs/Xserver/secint.xml
+	specs/XKB/XKBlib/XKBlib.book
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 2fad865..dfbd83e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,9 @@ AC_CONFIG_FILES([Makefile
 		 sgml/graphics/Makefile
 		 sgml/input/Makefile
 		 sgml/platforms/Makefile
-		 sgml/security/Makefile
 		 specs/Makefile
 		 specs/CTEXT/Makefile
 		 specs/ICCCM/Makefile
-		 specs/XLFD/Makefile])
+		 specs/XLFD/Makefile
+		 specs/Xserver/Makefile])
 AC_OUTPUT
diff --git a/sgml/Makefile.am b/sgml/Makefile.am
index a12c931..9e1a732 100644
--- a/sgml/Makefile.am
+++ b/sgml/Makefile.am
@@ -20,7 +20,7 @@
 #
 #  Process this file with autoconf to create configure.
 
-SUBDIRS = fonts graphics input platforms security
+SUBDIRS = fonts graphics input platforms
 
 x11docdir = $(docdir)
 SGML_FILES = \
diff --git a/sgml/security/Makefile.am b/sgml/security/Makefile.am
deleted file mode 100644
index 70e2164..0000000
--- a/sgml/security/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-#  Process this file with automake to create Makefile.in
-
-x11docdir = $(docdir)/security
-SGML_FILES = XACE-Spec.sgml
-include $(top_srcdir)/sgmlrules.in
diff --git a/specs/Makefile.am b/specs/Makefile.am
index 3728040..1365791 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -1 +1 @@
-SUBDIRS=CTEXT ICCCM XLFD
+SUBDIRS=CTEXT ICCCM XLFD Xserver
diff --git a/specs/Xserver/Makefile.am b/specs/Xserver/Makefile.am
new file mode 100644
index 0000000..24e4c95
--- /dev/null
+++ b/specs/Xserver/Makefile.am
@@ -0,0 +1,9 @@
+if ENABLE_SPECS
+
+xmldir = $(docdir)/$(subdir)
+doc_sources = analysis.xml appgroup.xml secint.xml XACE-Spec.xml
+dist_xml_DATA = $(doc_sources)
+
+include $(top_srcdir)/xmlrules.in
+
+endif ENABLE_SPECS
-- 
1.6.0.4