diff options
| author | Chris Mayo <aklhfex gmail com> | 2011-08-15 10:23:04 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-08-15 10:23:04 +0100 |
| commit | c82a83fb1b98092415aa6c7cc98d92d4174c9b08 (patch) | |
| tree | d271a3b0cbd07a4f39fe7118b43a49d1ab06cc77 /doc | |
| parent | 4a3e5b0af4046c602c98729a35786273f043bb09 (diff) | |
| download | dbus-c82a83fb1b98092415aa6c7cc98d92d4174c9b08.tar.gz | |
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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index e4ab5fb8..b36777cd 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 |