From 289c9275a341d4a6bd4a3226744e12997d6f4f64 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 12 Apr 2011 12:54:22 +0100 Subject: [PATCH 2/6] 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. --- doc/Makefile.am | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 11f756d..e402779 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 -- 1.7.4.1