Mercurial > hg > icedtea12
changeset 2567:67795f64537e
PR2383: Location of docs directory in install-data-local is incorrect
2015-05-24 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2383: Location of docs directory in
install-data-local is incorrect
* Makefile.am:
(install-data-local): 'docs' directory
is in BUILD_OUTPUT_DIR, not BUILD_IMAGE_DIR.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Mon, 08 Jun 2015 05:29:12 +0100 |
| parents | 10e7f91158ff |
| children | f7e2e0904a87 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 22 06:02:08 2015 +0100 +++ b/ChangeLog Mon Jun 08 05:29:12 2015 +0100 @@ -1,3 +1,12 @@ +2015-05-24 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2383: Location of docs directory in + install-data-local is incorrect + * Makefile.am: + (install-data-local): 'docs' directory + is in BUILD_OUTPUT_DIR, not BUILD_IMAGE_DIR. + * NEWS: Updated. + 2015-05-20 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2377: PaX mark the installed JDK so it runs
--- a/Makefile.am Fri May 22 06:02:08 2015 +0100 +++ b/Makefile.am Mon Jun 08 05:29:12 2015 +0100 @@ -2461,7 +2461,7 @@ touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.systemRootModFile if ENABLE_DOCS ${mkinstalldirs} $(DESTDIR)$(docdir)/html - cp -RP $(BUILD_IMAGE_DIR)/docs $(DESTDIR)$(docdir)/html + cp -RP $(BUILD_OUTPUT_DIR)/docs $(DESTDIR)$(docdir)/html endif if !ENABLE_JAMVM if !ENABLE_CACAO
--- a/NEWS Fri May 22 06:02:08 2015 +0100 +++ b/NEWS Mon Jun 08 05:29:12 2015 +0100 @@ -72,6 +72,7 @@ - PR2363: Remove EC source code prior to build - PR2369: SunEC provider is partially installed - PR2377: PaX mark the installed JDK so it runs on hardened systems + - PR2383: Location of docs directory in install-data-local is incorrect - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck