summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2010-06-11 11:11:24 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2010-06-11 11:11:24 +0000
commit20220fdd3c82e6e8ab2945b8b9e27c1800f2755a (patch)
tree37be6bd2420ec1d13c712dec0573f2773af2882e
parent2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-20220fdd3c82e6e8ab2945b8b9e27c1800f2755a.tar.bz2
2010-06-11 Ralf Corsépius <ralf.corsepius@rtems.org>
* main.am: Don't install html_projectdir unconditionally.
-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 07d2acb22f..9ebc9a5fd9 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 \