summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2010-06-11 11:11:29 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2010-06-11 11:11:29 +0000
commit5f86054d9f375c070e4487a01e2cd1963198c895 (patch)
tree25b8f08e6b6c79cfbefaf373f9a9cad58603a10e /doc
parent2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-5f86054d9f375c070e4487a01e2cd1963198c895.tar.bz2
2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* Makefile.am: Don't install html_imagesdir unconditionally.
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog1
-rw-r--r--doc/Makefile.am2
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 57acacafd6..457a88fea4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,6 @@
2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org>
+ * Makefile.am: Don't install html_imagesdir unconditionally.
* main.am: Don't install html_projectdir unconditionally.
* cpu_supplement/Makefile.am: Include main.am.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8f67ac1c1b..9995134666 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,7 +20,9 @@ EXTRA_DIST = HELP.html rtems_header.html.in rtems_footer.html.in
EXTRA_DIST += common/cpright.texi common/setup.texi \
common/treedef.tex common/rtems.texi.in
+if USE_HTML
html_imagesdir = $(htmldir)/images
+endif
HTML_IMAGES = images/dir-arrow.gif images/dvi.gif images/missing-arrow.gif \
images/next-arrow.gif images/oaronly.jpg images/pdf.gif images/pdf1.gif \