changeset in /hg/icedtea6: 2008-04-28 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset cf748f5fffce in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cf748f5fffce
description:
	2008-04-28  Matthias Klose  <doko at ubuntu.com>

	       * Makefile.am: Don't check md5sum if configured --with-openjdk-src-zip.
	       * Makefile.in: Regenerated.

diffstat:

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

diffs (60 lines):

diff -r 20700688fd03 -r cf748f5fffce ChangeLog
--- a/ChangeLog	Mon Apr 28 01:46:39 2008 +0200
+++ b/ChangeLog	Mon Apr 28 12:19:31 2008 +0200
@@ -1,3 +1,8 @@ 2008-04-27  Mark Wielaard  <mark at klomp.o
+2008-04-28  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Don't check md5sum if configured --with-openjdk-src-zip.
+	* Makefile.in: Regenerated.
+
 2008-04-27  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (ICEDTEA_PATCHES): Add icedtea-color-profiles.patch.
diff -r 20700688fd03 -r cf748f5fffce Makefile.am
--- a/Makefile.am	Mon Apr 28 01:46:39 2008 +0200
+++ b/Makefile.am	Mon Apr 28 12:19:31 2008 +0200
@@ -201,6 +201,8 @@ endif
 endif
 
 stamps/download.stamp:
+if USE_ALT_OPENJDK_SRC_ZIP
+else
 	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 	 | $(MD5SUM) --check ; \
 	then \
@@ -210,6 +212,7 @@ stamps/download.stamp:
 	 fi ; \
 	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
 	fi
+endif
 	mkdir -p stamps
 	touch stamps/download.stamp
 
diff -r 20700688fd03 -r cf748f5fffce Makefile.in
--- a/Makefile.in	Mon Apr 28 01:46:39 2008 +0200
+++ b/Makefile.in	Mon Apr 28 12:19:31 2008 +0200
@@ -788,15 +788,15 @@ snapshot: dist
 	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
 
 stamps/download.stamp:
-	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
-	 | $(MD5SUM) --check ; \
-	then \
-	 if [ $(OPENJDK_SRC_ZIP) ] ; \
-	 then \
-	   mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
-	 fi ; \
-	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
-	fi
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 | $(MD5SUM) --check ; \
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	then \
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 if [ $(OPENJDK_SRC_ZIP) ] ; \
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 then \
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	   mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 fi ; \
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
+ at USE_ALT_OPENJDK_SRC_ZIP_FALSE@	fi
 	mkdir -p stamps
 	touch stamps/download.stamp