diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-04-12 12:54:22 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-18 19:23:45 +0100 |
| commit | 37cb1522feaf764d15fd83a4c0e4f6910c13ae9b (patch) | |
| tree | 4dc6aba0cb10ffeb2bcd0f2a34d490a1dd806d03 /doc | |
| parent | b9f38fd024722c50c2f8ad961bbc752475bf0735 (diff) | |
| download | dbus-37cb1522feaf764d15fd83a4c0e4f6910c13ae9b.tar.gz | |
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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 11f756de..e402779e 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 |