/hg/icedtea7: PR2002: Fix references to hotspot.map following PR...

[andrew at icedtea.classpath.org]

changeset 17d957f63b11 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=17d957f63b11
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Sep 17 00:18:09 2014 +0100

	PR2002: Fix references to hotspot.map following PR2000

	2014-09-16  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* Makefile.am:
		(HS_TYPE): Fix hotspot.map path.
		(HS_URL): Likewise.
		(HS_CHANGESET): Likewise.
		(HS_SHA256SUM): Likewise.
		(EXTRA_DIST): Remove hotspot.map.
		hotspot.map.in is automatically added
		by autoconf.
		* NEWS: Updated.


diffstat:

 ChangeLog   |  12 ++++++++++++
 Makefile.am |  11 +++++------
 NEWS        |   1 +
 3 files changed, 18 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 45cfef3d9a3a -r 17d957f63b11 ChangeLog
--- a/ChangeLog	Tue Sep 16 23:38:31 2014 +0100
+++ b/ChangeLog	Wed Sep 17 00:18:09 2014 +0100
@@ -1,3 +1,15 @@
+2014-09-16  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* Makefile.am:
+	(HS_TYPE): Fix hotspot.map path.
+	(HS_URL): Likewise.
+	(HS_CHANGESET): Likewise.
+	(HS_SHA256SUM): Likewise.
+	(EXTRA_DIST): Remove hotspot.map.
+	hotspot.map.in is automatically added
+	by autoconf.
+	* NEWS: Updated.
+
 2014-09-16  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* hotspot.map: Moved to...
diff -r 45cfef3d9a3a -r 17d957f63b11 Makefile.am
--- a/Makefile.am	Tue Sep 16 23:38:31 2014 +0100
+++ b/Makefile.am	Wed Sep 17 00:18:09 2014 +0100
@@ -37,10 +37,10 @@
 ICEDTEA_HG_URL = http://icedtea.classpath.org/hg/$(ICEDTEA_PREFIX)
 ICEDTEA_URL = $(DROP_URL)/$(ICEDTEA_MAJOR)/$(ICEDTEA_RELEASE)
 
-HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
-HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$5}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
+HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
+HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$4}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
+HS_SHA256SUM = "`$(AWK) 'version==$$1 {print $$5}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
 
 # Build directories
 
@@ -741,8 +741,7 @@
 	$(top_srcdir)/patches/hotspot/*/*.patch \
 	tools-copy contrib overlays \
 	jconsole.desktop policytool.desktop \
-	$(JTREG_SRCS) HACKING fsg.sh \
-	hotspot.map autogen.sh \
+	$(JTREG_SRCS) HACKING fsg.sh autogen.sh \
 	tapset/hotspot.stp.in \
 	tapset/hotspot_jni.stp.in \
 	tapset/jstack.stp.in \
diff -r 45cfef3d9a3a -r 17d957f63b11 NEWS
--- a/NEWS	Tue Sep 16 23:38:31 2014 +0100
+++ b/NEWS	Wed Sep 17 00:18:09 2014 +0100
@@ -201,6 +201,7 @@
   - PR1989: Make jdk_generic_profile.sh handle missing programs better and be more verbose
   - PR1992, RH735336: Support retrieving proxy settings on GNOME 3.12.2
   - PR2000: Synchronise HEAD tarball paths with release branch paths
+  - PR2002: Fix references to hotspot.map following PR2000
 
 New in release 2.5.2 (2014-08-29):