From: Chris Mayo <aklhfex gmail com>
Date: Mon, 15 Aug 2011 09:23:04 +0000 (+0100)
Subject: Install diagrams in htmldir
X-Git-Tag: dbus-1.4.16~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c82a83fb1b98092415aa6c7cc98d92d4174c9b08;p=thirdparty%2Fdbus.git

Install diagrams in htmldir

diagram.png and diagram.svg are linked from dbus-tutorial.html but recent
changes to doc/Makefile.am mean that if htmldir is set with configure they are
installed such that the relative link from dbus-tutorial.html does not work.

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/doc/Makefile.am b/doc/Makefile.am
index e4ab5fb80..b36777cdf 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,10 +28,7 @@ DTDS = \
 	busconfig.dtd \
 	introspect.dtd
 
-dist_doc_DATA = \
-	diagram.png \
-	diagram.svg \
-	system-activation.txt
+dist_doc_DATA = system-activation.txt
 
 STATIC_DOCS = \
 	dbus-faq.xml \
@@ -51,7 +48,10 @@ EXTRA_DIST = \
 html_DATA =
 
 # we distribute these in the tarball so users don't necessarily need xmlto
-dist_html_DATA = $(XMLTO_OUTPUT)
+dist_html_DATA = \
+	diagram.png \
+	diagram.svg \
+	$(XMLTO_OUTPUT)
 
 XMLTO_OUTPUT=					\
 	dbus-faq.html				\
@@ -99,8 +99,8 @@ uninstall-local::
 	rm -f $(DESTDIR)$(apidir)/*.css
 	rm -f $(DESTDIR)$(htmldir)/*.html
 	rm -f $(DESTDIR)$(docdir)/*.txt
-	rm -f $(DESTDIR)$(docdir)/*.png
-	rm -f $(DESTDIR)$(docdir)/*.svg
+	rm -f $(DESTDIR)$(htmldir)/*.png
+	rm -f $(DESTDIR)$(htmldir)/*.svg
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(apidir) || \
 		rmdir $(DESTDIR)$(apidir)
 endif