/hg/release/icedtea6-1.7: PR icedtea/416: Don't use hardcoded ta...

[andrew at icedtea.classpath.org]

changeset 67b2774bbe54 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=67b2774bbe54
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 18 20:12:25 2010 +0000

	PR icedtea/416: Don't use hardcoded tarball names.

	2010-01-18 Andrew John Hughes <ahughes at redhat.com>

	 PR icedtea/416:
		* Makefile.am: Use $(OPENJDK_SRC_ZIP) and $(HOTSPOT_SRC_ZIP)
	to determine names of tarballs rather than hardcoding
	openjdk.tar.gz and hotspot.tar.gz


diffstat:

2 files changed, 12 insertions(+), 2 deletions(-)
ChangeLog   |    8 ++++++++
Makefile.am |    6 ++++--

diffs (31 lines):

diff -r 00dce3629da2 -r 67b2774bbe54 ChangeLog
--- a/ChangeLog	Sun Jan 17 00:34:54 2010 +0100
+++ b/ChangeLog	Mon Jan 18 20:12:25 2010 +0000
@@ -1,3 +1,11 @@ 2010-01-17  Matthias Klose  <doko at ubuntu
+2010-01-18 Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/416:
+	* Makefile.am:
+	Use $(OPENJDK_SRC_ZIP) and $(HOTSPOT_SRC_ZIP)
+	to determine names of tarballs rather than
+	hardcoding openjdk.tar.gz and hotspot.tar.gz
+	
 2010-01-17  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-sparc-trapsfix.patch: Merged sparc headers
diff -r 00dce3629da2 -r 67b2774bbe54 Makefile.am
--- a/Makefile.am	Sun Jan 17 00:34:54 2010 +0100
+++ b/Makefile.am	Mon Jan 18 20:12:25 2010 +0000
@@ -1792,8 +1792,10 @@ ADD_ZERO_CONFIGURE_ARGS += \
 			'--with-rmic=% '--with-additional-vms=% \
 			'--with-openjdk '--with-openjdk=% , \
 		$(CONFIGURE_ARGS)) \
-	$(foreach i, openjdk hotspot, \
-	  $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz))
+	$(if $(findstring --with-openjdk-src-zip=, $(CONFIGURE_ARGS)),, \
+	  --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP)) \
+	$(if $(findstring --with-hotspot-src-zip=, $(CONFIGURE_ARGS)),, \
+	  --with-hotspot-src-zip=$(abs_top_builddir)/$(HOTSPOT_SRC_ZIP))
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \