From: Colin Walters <walters@verbum.org>
Date: Sun, 8 Jan 2012 17:11:11 +0000 (-0500)
Subject: build: Make --disable-xml-docs build work again
X-Git-Tag: dbus-1.7.0~42^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e296f5c824321d5c12be3121d8159fe6a248c3fc;p=platform%2Fupstream%2Fdbus.git

build: Make --disable-xml-docs build work again

We can't build the .html files without xmlto, so don't add them
to a dist_ variable.

https://bugs.freedesktop.org/show_bug.cgi?id=55426
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b265987..db81b5c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -59,9 +59,6 @@ STATIC_HTML = \
 
 dist_html_DATA += $(STATIC_HTML)
 
-# we distribute these in the tarball so users don't necessarily need xmlto
-dist_html_DATA += $(XMLTO_OUTPUT)
-
 XMLTO_OUTPUT=					\
 	dbus-faq.html				\
 	dbus-specification.html			\
@@ -69,6 +66,10 @@ XMLTO_OUTPUT=					\
 	dbus-tutorial.html
 
 if DBUS_XML_DOCS_ENABLED
+
+# we distribute these in the tarball so users don't necessarily need xmlto
+dist_html_DATA += $(XMLTO_OUTPUT)
+
 dbus-specification.html: dbus-specification.xml
 	$(XMLTO) html-nochunks $<