Mercurial > hg > icedtea7
changeset 2819:19d189fdd81a
PR2531: Location of docs directory in install-data-local is incorrect
2015-05-24 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2531: 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 | Tue, 14 Jul 2015 20:53:49 +0100 |
| parents | fe2936ab2d22 |
| children | a7ee53fba321 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jul 14 20:45:14 2015 +0100 +++ b/ChangeLog Tue Jul 14 20:53:49 2015 +0100 @@ -1,3 +1,12 @@ +2015-05-24 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2531: 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> PR2530: PaX mark the installed JDK so it runs
--- a/Makefile.am Tue Jul 14 20:45:14 2015 +0100 +++ b/Makefile.am Tue Jul 14 20:53:49 2015 +0100 @@ -2873,7 +2873,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 Tue Jul 14 20:45:14 2015 +0100 +++ b/NEWS Tue Jul 14 20:53:49 2015 +0100 @@ -326,6 +326,7 @@ - PR2499: Update remove-intree-libraries.sh script - PR2507, G541462: Only apply PaX markings by default on running PaX kernels - PR2530: PaX mark the installed JDK so it runs on hardened systems + - PR2531: Location of docs directory in install-data-local is incorrect * AArch64 port - Add copyright to aarch64_ad.m4 - S8069593: Changes to JavaThread::_thread_state must use acquire and release