From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 12 Apr 2011 11:54:22 +0000 (+0100)
Subject: Install dbus.devhelp to $(htmldir), not $(apidir), and remove it in clean
X-Git-Tag: dbus-1.4.14~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37cb1522feaf764d15fd83a4c0e4f6910c13ae9b;p=thirdparty%2Fdbus.git

Install dbus.devhelp to $(htmldir), not $(apidir), and remove it in clean

It needs to be in $(htmldir) so that its relative paths will work.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=36156
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 11f756de1..e402779e6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -46,6 +46,8 @@ EXTRA_DIST = \
 	$(STATIC_DOCS) \
 	$(MAN_IN_FILES)
 
+html_DATA =
+
 HTML_FILES=					\
 	dbus-faq.html				\
 	dbus-specification.html			\
@@ -79,7 +81,7 @@ doxygen.stamp: $(wildcard $(top_srcdir)/dbus/*.[ch])
 	@touch $@
 
 if DBUS_HAVE_XSLTPROC
-api_DATA = dbus.devhelp
+html_DATA += dbus.devhelp
 
 dbus.devhelp: $(srcdir)/doxygen_to_devhelp.xsl doxygen.stamp
 	$(XSLTPROC) -o $@ $< api/xml/index.xml
@@ -147,6 +149,7 @@ maintainer-upload-docs:
 endif
 
 clean-local:
+	rm -f $(html_DATA)
 	rm -rf api
 	rm -rf dbus-docs
 	rm -f *.1.html