Mercurial > hg > icedtea10
changeset 2586:d9532d535bb7
PR2447: Allow greater control of Javadoc installation directory
2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2447: 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 | Thu, 18 Jun 2015 00:07:10 +0100 |
| parents | 837a3359425b |
| children | f9e92005cb3e |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 17 22:39:38 2015 +0100 +++ b/ChangeLog Thu Jun 18 00:07:10 2015 +0100 @@ -1,3 +1,15 @@ +2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2447: 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> PR2443: install stage fails where
--- a/Makefile.am Wed Jun 17 22:39:38 2015 +0100 +++ b/Makefile.am Thu Jun 18 00:07:10 2015 +0100 @@ -2489,8 +2489,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 Wed Jun 17 22:39:38 2015 +0100 +++ b/NEWS Thu Jun 18 00:07:10 2015 +0100 @@ -109,6 +109,7 @@ - PR2434: SystemTap support is no longer optional - PR2439: NSS PKCS11 regression - due to java.security automatic loading - PR2443: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR + - PR2447: Allow greater control of Javadoc installation directory - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck