summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2012-01-08 12:11:11 -0500
committerColin Walters <walters@verbum.org>2012-10-02 08:41:44 -0400
commite296f5c824321d5c12be3121d8159fe6a248c3fc (patch)
treed51d2e327bf2008a5cba5faa9fd4a12509d43b67 /doc
parentc7495461fe6b48b4070452ed8640fbc4888f1210 (diff)
downloaddbus-e296f5c824321d5c12be3121d8159fe6a248c3fc.tar.gz
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
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b2659871..db81b5c7 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 $<