fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 15:47:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install diagrams in htmldir

Browse source 
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>
This commit is contained in:
Chris Mayo 2011-08-15 10:23:04 +01:00 • committed by Simon McVittie
parent 4a3e5b0af4
commit c82a83fb1b
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/Makefile.am
View file

@ -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