changeset in /hg/icedtea6: * Makefile.am (OPENJDK_URL): Add prom...

[Mark Wielaard]

changeset c53a2df6c9f6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c53a2df6c9f6
description:
	* Makefile.am (OPENJDK_URL): Add promoted version.
	       * Makefile.in: Regenerated.

diffstat:

3 files changed, 9 insertions(+), 4 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    4 ++--
Makefile.in |    4 ++--

diffs (54 lines):

diff -r d33bf4f953a0 -r c53a2df6c9f6 ChangeLog
--- a/ChangeLog	Fri Feb 15 11:58:44 2008 -0500
+++ b/ChangeLog	Fri Feb 15 19:28:53 2008 +0100
@@ -1,3 +1,8 @@ 2008-02-15  Lillian Angel  <langel at redha
+2008-02-15  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (OPENJDK_URL): Add promoted version.
+	* Makefile.in: Regenerated.
+
 2008-02-15  Lillian Angel  <langel at redhat.com>
 
 	* INSTALL: Updated.
diff -r d33bf4f953a0 -r c53a2df6c9f6 Makefile.am
--- a/Makefile.am	Fri Feb 15 11:58:44 2008 -0500
+++ b/Makefile.am	Fri Feb 15 19:28:53 2008 +0100
@@ -124,7 +124,7 @@ snapshot: dist
 # ==================================
 
 # Download OpenJDK sources.
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/ 
+OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 
 if USE_ALT_OPENJDK_SRC_ZIP
   OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
@@ -140,7 +140,7 @@ stamps/download.stamp:
 	 then \
 	   mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
 	 fi ; \
-	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
+	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
 	fi
 	mkdir -p stamps
 	touch stamps/download.stamp
diff -r d33bf4f953a0 -r c53a2df6c9f6 Makefile.in
--- a/Makefile.in	Fri Feb 15 11:58:44 2008 -0500
+++ b/Makefile.in	Fri Feb 15 19:28:53 2008 +0100
@@ -299,7 +299,7 @@ ICEDTEA_ENV_ECJ = \
 # ==================================
 
 # Download OpenJDK sources.
-OPENJDK_URL = http://download.java.net/openjdk/jdk6/ 
+OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
 @USE_ALT_OPENJDK_SRC_ZIP_FALSE at OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz
 @USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP)
 @FAST_BUILD_FALSE at FAST_BUILD_PATCH = 
@@ -716,7 +716,7 @@ stamps/download.stamp:
 	 then \
 	   mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
 	 fi ; \
-	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \
+	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
 	fi
 	mkdir -p stamps
 	touch stamps/download.stamp