andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Gaetan Nadon 2011-05-14 13:30:19 -04:00 committed by Keith Packard
parent dbe26634e4
commit 96c65be39b
7 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -78,3 +78,4 @@ core
# #
doltcompile doltcompile
doltlibtool doltlibtool
xserver.ent

2
configure.ac
View File

@ -2154,7 +2154,6 @@ dix/Makefile
doc/Makefile doc/Makefile
doc/dtrace/Makefile doc/dtrace/Makefile
doc/xml/Makefile doc/xml/Makefile
doc/xml/xserver.ent
man/Makefile man/Makefile
fb/Makefile fb/Makefile
record/Makefile record/Makefile
@ -2244,5 +2243,6 @@ hw/kdrive/linux/Makefile
hw/kdrive/src/Makefile hw/kdrive/src/Makefile
test/Makefile test/Makefile
test/xi2/Makefile test/xi2/Makefile
xserver.ent
xorg-server.pc xorg-server.pc
]) ])

2
devbook.am
View File

@ -30,7 +30,7 @@ if HAVE_STYLESHEETS
# The location where all cross reference databases are installed # The location where all cross reference databases are installed
XMLTO_FLAGS = \ XMLTO_FLAGS = \
--searchpath "$(XORG_SGML_PATH)/X11" \ --searchpath "$(XORG_SGML_PATH)/X11" \
--searchpath "$(abs_top_builddir)/doc/xml" \ --searchpath "$(abs_top_builddir)" \
--stringparam current.docid="$(<:.xml=)" --stringparam current.docid="$(<:.xml=)"
XMLTO_XHTML_FLAGS = \ XMLTO_XHTML_FLAGS = \

2
doc/xml/.gitignore vendored
View File

@ -1,5 +1,3 @@
# Add & Override for this directory and its subdirectories
xserver.ent
Xserver-spec.html Xserver-spec.html
Xserver-spec.pdf Xserver-spec.pdf
Xserver-spec.txt Xserver-spec.txt

2
doc/xml/xmlrules.in
View File

@ -27,7 +27,7 @@
# It is included by xmlrules-noinst for non installable developer's documentation # It is included by xmlrules-noinst for non installable developer's documentation
# If the server version or release date changes, autogen && make # 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 SUFFIXES = .xml .txt .html .pdf
XMLTO_FLAGS = --searchpath $(XML_ENT_DIR) XMLTO_FLAGS = --searchpath $(XML_ENT_DIR)

2
docbook.am
View File

@ -32,7 +32,7 @@ sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml" masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
XMLTO_FLAGS = \ XMLTO_FLAGS = \
--searchpath "$(XORG_SGML_PATH)/X11" \ --searchpath "$(XORG_SGML_PATH)/X11" \
--searchpath "$(abs_top_builddir)/doc/xml" \ --searchpath "$(abs_top_builddir)" \
--stringparam target.database.document=$(masterdb) \ --stringparam target.database.document=$(masterdb) \
--stringparam current.docid="$(<:.xml=)" \ --stringparam current.docid="$(<:.xml=)" \
--stringparam collect.xref.targets="no" --stringparam collect.xref.targets="no"

0
doc/xml/xserver.ent.in → xserver.ent.in
View File