build: Make --disable-xml-docs build work again
authorColin Walters <walters@verbum.org>
Sun, 8 Jan 2012 17:11:11 +0000 (12:11 -0500)
committerColin Walters <walters@verbum.org>
Tue, 2 Oct 2012 12:41:44 +0000 (08:41 -0400)
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

doc/Makefile.am

index b2659871c6fdf136c019bc28cff8ccd1f2cd74f8..db81b5c799c2edcfea02accf9a0d3e94821e8421 100644 (file)
@@ -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 $<