summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-05-14 13:30:19 -0400
committerKeith Packard <keithp@keithp.com>2011-05-14 11:22:26 -0700
commit96c65be39b98cfe035be0a3988dce519549249f3 (patch)
tree1a5c776841885d273b53b87811048c0c0db26186 /doc
parentdbe26634e4f12eba905540666783c9879aa3a49a (diff)
doc: relocate xserver.ent in the package root directory
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@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/xml/.gitignore2
-rw-r--r--doc/xml/xmlrules.in2
-rw-r--r--doc/xml/xserver.ent.in3
3 files changed, 1 insertions, 6 deletions
diff --git a/doc/xml/.gitignore b/doc/xml/.gitignore
index 496173835..3f0ed1358 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 f6a2e4f7a..8b227610c 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/doc/xml/xserver.ent.in b/doc/xml/xserver.ent.in
deleted file mode 100644
index 5cb4e23d3..000000000
--- a/doc/xml/xserver.ent.in
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- shared -*-xml-*- entity definitions for the X server documentation -->
-<!ENTITY xserver.version "@PACKAGE_VERSION@">
-<!ENTITY xserver.reldate "@RELEASE_DATE@">