Mercurial > hg > release > icedtea6-1.2

changeset 839:cf748f5fffce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-04-28 Matthias Klose <doko@ubuntu.com> * Makefile.am: Don't check md5sum if configured --with-openjdk-src-zip. * Makefile.in: Regenerated.
author doko@ubuntu.com
date Mon, 28 Apr 2008 12:19:31 +0200
parents 20700688fd03
children 0bdd2917dfdb
files ChangeLog Makefile.am Makefile.in
diffstat 3 files changed, 17 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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-28  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am: Don't check md5sum if configured --with-openjdk-src-zip.
+	* Makefile.in: Regenerated.
+
 2008-04-27  Mark Wielaard  <mark@klomp.org>
 
 	* Makefile.am (ICEDTEA_PATCHES): Add icedtea-color-profiles.patch.
--- 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
 
 stamps/download.stamp:
+if USE_ALT_OPENJDK_SRC_ZIP
+else
 	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 	 | $(MD5SUM) --check ; \
 	then \
@@ -210,6 +212,7 @@
 	 fi ; \
 	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
 	fi
+endif
 	mkdir -p stamps
 	touch stamps/download.stamp
 
--- 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 @@
 	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
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 | $(MD5SUM) --check ; \
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@	then \
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 if [ $(OPENJDK_SRC_ZIP) ] ; \
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 then \
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@	   mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 fi ; \
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@	 $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
+@USE_ALT_OPENJDK_SRC_ZIP_FALSE@	fi
 	mkdir -p stamps
 	touch stamps/download.stamp