From 57818d0fe4f7cf94279909f03ec11b326b284f1e Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 26 Nov 2010 15:22:07 +0000
Subject: libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010

---
 xorg-server/doc/xml/dtrace/Makefile.am | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'xorg-server/doc/xml/dtrace')

diff --git a/xorg-server/doc/xml/dtrace/Makefile.am b/xorg-server/doc/xml/dtrace/Makefile.am
index dc6127416..8bbe040d8 100644
--- a/xorg-server/doc/xml/dtrace/Makefile.am
+++ b/xorg-server/doc/xml/dtrace/Makefile.am
@@ -21,18 +21,16 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-XML_FILES = Xserver-DTrace.xml
-
-include ../xmlrules.in
+doc_sources =  Xserver-DTrace.xml
 
 if ENABLE_DOCS
+
+# This user's documentation is installed only if tracing is available
 if XSERVER_DTRACE
-doc_DATA = $(BUILT_DOC_FILES)
+include $(top_srcdir)/doc/xml/xmlrules-inst.in
 else
-noinst_DATA = $(BUILT_DOC_FILES)
-endif
+include $(top_srcdir)/doc/xml/xmlrules-noinst.in
 endif
 
-CLEANFILES = $(CLEAN_DOC_FILES)
+endif
 
-EXTRA_DIST = $(XML_FILES)
-- 
cgit v1.2.3