[PATCH xserver 8/9] doc: relocate xserver.ent in the package root directory

[Gaetan Nadon]

This is the appropriate location for reusable configuration and/or
makefile artifacts as opposed to picking one of the subdirs where
it is used.

It shields them from future doc reorg as every subdir
will refer to the root package which never changes location.

Reviewed-by Jeremy Huddleston <jeremyhu at apple.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 .gitignore                               |    1 +
 configure.ac                             |    2 +-
 devbook.am                               |    2 +-
 doc/xml/.gitignore                       |    2 --
 doc/xml/xmlrules.in                      |    2 +-
 docbook.am                               |    2 +-
 doc/xml/xserver.ent.in => xserver.ent.in |    0
 7 files changed, 5 insertions(+), 6 deletions(-)
 rename doc/xml/xserver.ent.in => xserver.ent.in (100%)

diff --git a/.gitignore b/.gitignore
index 72390a0..94a12fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,3 +78,4 @@ core
 # 
 doltcompile
 doltlibtool
+xserver.ent
diff --git a/configure.ac b/configure.ac
index 7ead83b..eb971bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2140,7 +2140,6 @@ dix/Makefile
 doc/Makefile
 doc/dtrace/Makefile
 doc/xml/Makefile
-doc/xml/xserver.ent
 man/Makefile
 fb/Makefile
 record/Makefile
@@ -2230,5 +2229,6 @@ hw/kdrive/linux/Makefile
 hw/kdrive/src/Makefile
 test/Makefile
 test/xi2/Makefile
+xserver.ent
 xorg-server.pc
 ])
diff --git a/devbook.am b/devbook.am
index dbc9d8a..4e23bb7 100644
--- a/devbook.am
+++ b/devbook.am
@@ -30,7 +30,7 @@ if HAVE_STYLESHEETS
 # The location where all cross reference databases are installed
 XMLTO_FLAGS =						\
 	--searchpath "$(XORG_SGML_PATH)/X11"		\
-	--searchpath "$(abs_top_builddir)/doc/xml"	\
+	--searchpath "$(abs_top_builddir)"		\
 	--stringparam current.docid="$(<:.xml=)"
 
 XMLTO_XHTML_FLAGS = \
diff --git a/doc/xml/.gitignore b/doc/xml/.gitignore
index 4961738..3f0ed13 100644
--- a/doc/xml/.gitignore
+++ b/doc/xml/.gitignore
@@ -1,5 +1,3 @@
-#		Add & Override for this directory and its subdirectories
-xserver.ent
 Xserver-spec.html
 Xserver-spec.pdf
 Xserver-spec.txt
diff --git a/doc/xml/xmlrules.in b/doc/xml/xmlrules.in
index f6a2e4f..8b22761 100644
--- a/doc/xml/xmlrules.in
+++ b/doc/xml/xmlrules.in
@@ -27,7 +27,7 @@
 # It is included by xmlrules-noinst for non installable developer's documentation
 # If the server version or release date changes, autogen && make
 
-XML_ENT_DIR = $(abs_top_builddir)/doc/xml
+XML_ENT_DIR = $(abs_top_builddir)
 SUFFIXES = .xml .txt .html .pdf
 
 XMLTO_FLAGS = --searchpath $(XML_ENT_DIR)
diff --git a/docbook.am b/docbook.am
index 50a542e..7ab7a00 100644
--- a/docbook.am
+++ b/docbook.am
@@ -32,7 +32,7 @@ sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
 masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
 XMLTO_FLAGS =							\
 	--searchpath "$(XORG_SGML_PATH)/X11"			\
-	--searchpath "$(abs_top_builddir)/doc/xml"		\
+	--searchpath "$(abs_top_builddir)"			\
 	--stringparam target.database.document=$(masterdb)	\
 	--stringparam current.docid="$(<:.xml=)"		\
 	--stringparam collect.xref.targets="no"
diff --git a/doc/xml/xserver.ent.in b/xserver.ent.in
similarity index 100%
rename from doc/xml/xserver.ent.in
rename to xserver.ent.in
-- 
1.6.0.4