Mercurial > hg > icedtea7
changeset 2821:d5ae2c250a3f
PR2533: Allow greater control of Javadoc installation directory
2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2533: Allow greater control of Javadoc
installation directory
* Makefile.am:
(install-data-local): Install Javadocs into
$htmldir rather than $docdir/html, so the
user has more control over where they end up.
Copy the contents of docs rather than the
directory itself.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Tue, 14 Jul 2015 22:02:48 +0100 |
| parents | a7ee53fba321 |
| children | 5f024eba68e3 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jul 14 21:58:23 2015 +0100 +++ b/ChangeLog Tue Jul 14 22:02:48 2015 +0100 @@ -1,3 +1,15 @@ +2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2533: Allow greater control of Javadoc + installation directory + * Makefile.am: + (install-data-local): Install Javadocs into + $htmldir rather than $docdir/html, so the + user has more control over where they end up. + Copy the contents of docs rather than the + directory itself. + * NEWS: Updated. + 2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2532: install stage fails where
--- a/Makefile.am Tue Jul 14 21:58:23 2015 +0100 +++ b/Makefile.am Tue Jul 14 22:02:48 2015 +0100 @@ -2872,8 +2872,8 @@ touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.system.lock touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.systemRootModFile if ENABLE_DOCS - ${mkinstalldirs} $(DESTDIR)$(docdir)/html - cp -RP $(BUILD_OUTPUT_DIR)/docs $(DESTDIR)$(docdir)/html + ${mkinstalldirs} $(DESTDIR)$(htmldir) + cp -RP $(BUILD_OUTPUT_DIR)/docs/* $(DESTDIR)$(htmldir) endif if !ENABLE_JAMVM if !ENABLE_CACAO
--- a/NEWS Tue Jul 14 21:58:23 2015 +0100 +++ b/NEWS Tue Jul 14 22:02:48 2015 +0100 @@ -328,6 +328,7 @@ - PR2530: PaX mark the installed JDK so it runs on hardened systems - PR2531: Location of docs directory in install-data-local is incorrect - PR2532: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR + - PR2533: Allow greater control of Javadoc installation directory * AArch64 port - Add copyright to aarch64_ad.m4 - S8069593: Changes to JavaThread::_thread_state must use acquire and release