[PATCH libX11 3/6] docbook.am: add search path for local entities

Gaetan Nadon memsize at videotron.ca
Fri Sep 9 12:24:11 PDT 2011


Currently, only $(XORG_SGML_PATH)/X11 is searched for xml entities.
A module may want to add entities that apply only to itself and
not to all modules, like the xserver does.

This feature may or may not be used in this module, but all modules
share a copy of docbook.am.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 docbook.am |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/docbook.am b/docbook.am
index 5dead3f..d968a75 100644
--- a/docbook.am
+++ b/docbook.am
@@ -31,6 +31,7 @@ shelf_DATA += $(docbook:.xml=.html)
 	$(AM_V_GEN)$(XMLTO)						\
 	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl				\
 	--searchpath "$(XORG_SGML_PATH)/X11"				\
+	--searchpath "$(abs_top_builddir)"				\
 	--stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css	\
 	--stringparam target.database.document=$(masterdb)		\
 	--stringparam current.docid="$(<:.xml=)"			\
@@ -42,6 +43,7 @@ shelf_DATA += $(docbook:.xml=.pdf)
 	$(AM_V_GEN)$(XMLTO)					\
 	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl			\
 	--searchpath "$(XORG_SGML_PATH)/X11"			\
+	--searchpath "$(abs_top_builddir)"			\
 	--stringparam target.database.document=$(masterdb)	\
 	--stringparam current.docid="$(<:.xml=)"		\
 	--stringparam img.src.path=$(abs_builddir)/		\
@@ -52,6 +54,7 @@ shelf_DATA += $(docbook:.xml=.ps)
 	$(AM_V_GEN)$(XMLTO) 					\
 	-x $(STYLESHEET_SRCDIR)/xorg-fo.xsl			\
 	--searchpath "$(XORG_SGML_PATH)/X11"			\
+	--searchpath "$(abs_top_builddir)"			\
 	--stringparam target.database.document=$(masterdb)	\
 	--stringparam current.docid="$(<:.xml=)"		\
 	--stringparam img.src.path=$(abs_builddir)/		\
@@ -64,6 +67,7 @@ shelf_DATA += $(docbook:.xml=.txt)
 	$(AM_V_GEN)$(XMLTO) 				\
 	-x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl		\
 	--searchpath "$(XORG_SGML_PATH)/X11"		\
+	--searchpath "$(abs_top_builddir)"		\
 	txt $<
 endif HAVE_XMLTO_TEXT
 
@@ -72,6 +76,7 @@ if HAVE_XSLTPROC
 
 XSLTPROC_FLAGS =					\
 	--path "$(XORG_SGML_PATH)/X11"			\
+	--path "$(abs_top_builddir)"			\
 	--stringparam targets.filename "$@"		\
 	--stringparam collect.xref.targets "only"	\
 	--nonet --xinclude
-- 
1.7.4.1



More information about the xorg-devel mailing list