/hg/icedtea: PR2456: Installation path for hotspot_gc.stp is wro...

[andrew at icedtea.classpath.org]

changeset cc59adf48734 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=cc59adf48734
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jun 18 23:57:36 2015 +0100

	PR2456: Installation path for hotspot_gc.stp is wrong, due to changed j2sdk-image location

	2015-06-17  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR2456: Installation patch for hotspot_gc.stp is
		wrong, due to changed j2sdk-image location
		* Makefile.am:
		(icedtea): Fix path to hotspot_gc.stp.
		(icedtea-debug): Likewise.
		* NEWS: Updated.


diffstat:

 ChangeLog   |  9 +++++++++
 Makefile.am |  6 +++---
 NEWS        |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r a366a80437b7 -r cc59adf48734 ChangeLog
--- a/ChangeLog	Thu Jun 18 20:27:38 2015 +0100
+++ b/ChangeLog	Thu Jun 18 23:57:36 2015 +0100
@@ -1,3 +1,12 @@
+2015-06-17  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR2456: Installation path for hotspot_gc.stp is
+	wrong, due to changed j2sdk-image location
+	* Makefile.am:
+	(icedtea): Fix path to hotspot_gc.stp.
+	(icedtea-debug): Likewise.
+	* NEWS: Updated.
+
 2015-06-17  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	PR2454: install-data-local needs to check that
diff -r a366a80437b7 -r cc59adf48734 Makefile.am
--- a/Makefile.am	Thu Jun 18 20:27:38 2015 +0100
+++ b/Makefile.am	Thu Jun 18 23:57:36 2015 +0100
@@ -1584,7 +1584,7 @@
 	    > $(BUILD_SDK_DIR)/tapset/hotspot_jni.stp; \
 	  sed -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
-	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	    > $(BUILD_SDK_DIR)/tapset/hotspot_gc.stp; \
 	else \
 	  cp $(abs_top_builddir)/tapset/hotspot.stp \
 	    $(BUILD_SDK_DIR)/tapset/hotspot.stp; \
@@ -1658,14 +1658,14 @@
 	    > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
 	  sed -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_gc.stp \
-	    > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	    > $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_gc.stp; \
 	else \
 	  cp $(abs_top_builddir)/tapset/hotspot.stp \
 	    $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
 	    $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_jni.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_gc.stp \
-	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \
+	    $(BUILD_DEBUG_SDK_DIR)/tapset/hotspot_gc.stp; \
 	fi; \
 	cp $(abs_top_builddir)/tapset/jstack.stp \
 	  $(BUILD_DEBUG_SDK_DIR)/tapset/jstack.stp
diff -r a366a80437b7 -r cc59adf48734 NEWS
--- a/NEWS	Thu Jun 18 20:27:38 2015 +0100
+++ b/NEWS	Thu Jun 18 23:57:36 2015 +0100
@@ -112,6 +112,7 @@
   - PR2447: Allow greater control of Javadoc installation directory
   - PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
   - PR2454: install-data-local needs to check that classes.jsa actually exists
+  - PR2456: Installation path for hotspot_gc.stp is wrong, due to changed j2sdk-image location
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck