From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 12 Apr 2011 12:06:25 +0000 (+0100)
Subject: Install diagram.*, system-activation.txt to the $(docdir)
X-Git-Tag: dbus-1.4.14~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14dab0789e3da38d94249abb536ca56f7fd94cbb;p=thirdparty%2Fdbus.git

Install diagram.*, system-activation.txt to the $(docdir)

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 8af7faf08..7648a8b1e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,16 +28,18 @@ DTDS = \
 	busconfig.dtd \
 	introspect.dtd
 
-STATIC_DOCS = \
+dist_doc_DATA = \
 	diagram.png \
 	diagram.svg \
+	system-activation.txt
+
+STATIC_DOCS = \
 	dbus-faq.xml \
 	dbus-specification.xml \
 	dbus-test-plan.xml \
 	dbus-tutorial.xml \
 	dcop-howto.txt \
 	introspect.xsl \
-	system-activation.txt \
 	$(DTDS)
 
 EXTRA_DIST = \
@@ -115,10 +117,11 @@ BONUS_FILES = \
 	$(top_srcdir)/COPYING \
 	$(top_srcdir)/ChangeLog
 
-dbus-docs: $(STATIC_DOCS) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp
+dbus-docs: $(STATIC_DOCS) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp
 	$(AM_V_at)rm -rf $@
 	$(AM_V_GEN)$(MKDIR_P) $@/api
 	$(AM_V_at)cp $(STATIC_DOCS) $@
+	$(AM_V_at)cp $(dist_doc_DATA) $@
 	$(AM_V_at)cp $(dist_html_DATA) $@
 	$(AM_V_at)cp $(MAN_HTML_FILES) $@
 	$(AM_V_at)cp $(BONUS_FILES) $@