xserver: Branch 'master'

[Keith Packard]

 docbook.am |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 945b2ff8141c58344fc9558ee3853fad3e86134b
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Wed Jun 8 15:18:12 2011 -0400

    docbook.am: --path is also required for xsltproc
    
    The XSLT processor also needs to know about the entities defined
    in xserver.ent. It removes error messages.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/docbook.am b/docbook.am
index f1861c0..eb3bf0c 100644
--- a/docbook.am
+++ b/docbook.am
@@ -79,6 +79,7 @@ shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
 # Flags for the XSL Transformation processor generating xref target databases
 XSLTPROC_FLAGS =					\
 	--path "$(XORG_SGML_PATH)/X11"			\
+	--path "$(abs_top_builddir)"			\
 	--stringparam targets.filename "$@"		\
 	--stringparam collect.xref.targets "only"	\
 	--nonet --xinclude