changeset in /hg/icedtea6: 2008-08-12 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

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

	        * Makefile.am (stamps/cacao.stamp): Robustify.

diffstat:

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

diffs (32 lines):

diff -r 3b7c41ea8ccb -r 5fd318f3b379 ChangeLog
--- a/ChangeLog	Tue Aug 12 13:43:16 2008 -0400
+++ b/ChangeLog	Tue Aug 12 20:23:58 2008 +0200
@@ -1,3 +1,7 @@ 2008-08-12  Lillian Angel  <langel at redha
+2008-08-12  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (stamps/cacao.stamp): Robustify.
+
 2008-08-12  Lillian Angel  <langel at redhat.com>
 
 	* HACKING: Added icedtea-enum-bug-181.patch.
diff -r 3b7c41ea8ccb -r 5fd318f3b379 Makefile.am
--- a/Makefile.am	Tue Aug 12 13:43:16 2008 -0400
+++ b/Makefile.am	Tue Aug 12 20:23:58 2008 +0200
@@ -2,7 +2,7 @@ OPENJDK_MD5SUM = 8e60cdac02ec1b2d8ddb9d7
 OPENJDK_MD5SUM = 8e60cdac02ec1b2d8ddb9d7369be69df
 OPENJDK_VERSION = b11
 
-CACAO_VERSION = 0.99.2
+CACAO_VERSION = 0.99.3
 CACAO_MD5SUM = a2865f47535f6dc3def268c0055ff20a
 
 NETBEANS_PLATFORM_MD5SUM = 77c79b3a7d3dbe6a8858639f8d564a38
@@ -1250,7 +1250,7 @@ stamps/cacao.stamp: stamps/extract.stamp
 stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
 if WITH_CACAO
 if !USE_SYSTEM_CACAO
-	cd cacao/cacao-$(CACAO_VERSION) ; \
+	cd cacao/cacao-$(CACAO_VERSION) && \
 	./configure \
 	  --prefix=$(abs_top_builddir)/cacao/install \
 	  --with-java-runtime-library=openjdk \