Commit 96c65be3 authored by Gaetan Nadon's avatar Gaetan Nadon Committed by Keith Packard

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: default avatarGaetan Nadon <memsize@videotron.ca>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
parent dbe26634
......@@ -78,3 +78,4 @@ core
#
doltcompile
doltlibtool
xserver.ent
......@@ -2154,7 +2154,6 @@ dix/Makefile
doc/Makefile
doc/dtrace/Makefile
doc/xml/Makefile
doc/xml/xserver.ent
man/Makefile
fb/Makefile
record/Makefile
......@@ -2244,5 +2243,6 @@ hw/kdrive/linux/Makefile
hw/kdrive/src/Makefile
test/Makefile
test/xi2/Makefile
xserver.ent
xorg-server.pc
])
......@@ -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 = \
......
# Add & Override for this directory and its subdirectories
xserver.ent
Xserver-spec.html
Xserver-spec.pdf
Xserver-spec.txt
......@@ -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)
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment