Mercurial > hg > icedtea7

changeset 2823:a3c123889979

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2535: install-data-local needs to check that classes.jsa actually exists 2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2535: install-data-local needs to check that classes.jsa actually exists * Makefile.am: (install-data-local): Remove conditionals around classes.jsa installation, instead just checking that the file exists. Create the directory for it first, as technically install-data-local does not depend on install-exec-local and so should be self-sufficient. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 14 Jul 2015 22:35:05 +0100
parents 5f024eba68e3
children 4aafb042a399
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 16 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 14 22:06:23 2015 +0100
+++ b/ChangeLog	Tue Jul 14 22:35:05 2015 +0100
@@ -1,3 +1,16 @@
+2015-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2535: install-data-local needs to check that
+	classes.jsa actually exists
+	* Makefile.am:
+	(install-data-local): Remove conditionals around
+	classes.jsa installation, instead just checking
+	that the file exists. Create the directory for it
+	first, as technically install-data-local does not
+	depend on install-exec-local and so should be
+	self-sufficient.
+	* NEWS: Updated.
+
 2015-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2534: Install TRADEMARK, COPYING and ChangeLog
--- a/Makefile.am	Tue Jul 14 22:06:23 2015 +0100
+++ b/Makefile.am	Tue Jul 14 22:35:05 2015 +0100
@@ -2878,18 +2878,13 @@
 	${mkinstalldirs} $(DESTDIR)$(htmldir)
 	cp -RP $(BUILD_OUTPUT_DIR)/docs/* $(DESTDIR)$(htmldir)
 endif
-if !ENABLE_JAMVM
-if !ENABLE_CACAO
-if !ZERO_BUILD
 	for vms in client server ; do \
-	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
+	  if [ -f $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/classes.jsa ] ; then \
+	    ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
 	    $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/classes.jsa \
 	      $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
 	  fi ; \
 	done
-endif
-endif
-endif
 # Target Aliases
 # ===============
 
--- a/NEWS	Tue Jul 14 22:06:23 2015 +0100
+++ b/NEWS	Tue Jul 14 22:35:05 2015 +0100
@@ -330,6 +330,7 @@
   - PR2532: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR
   - PR2533: Allow greater control of Javadoc installation directory
   - PR2534: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
+  - PR2535: install-data-local needs to check that classes.jsa actually exists
 * AArch64 port
   - Add copyright to aarch64_ad.m4
   - S8069593: Changes to JavaThread::_thread_state must use acquire and release