changeset in /hg/icedtea6: 2008-10-07 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

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

		* Makefile.am: Don't rely on versioned cacao source directory.

diffstat:

2 files changed, 7 insertions(+), 1 deletion(-)
ChangeLog   |    4 ++++
Makefile.am |    4 +++-

diffs (32 lines):

diff -r d6c8840e4167 -r e4575e17609d ChangeLog
--- a/ChangeLog	Mon Oct 06 12:02:04 2008 +0200
+++ b/ChangeLog	Tue Oct 07 14:11:49 2008 +0200
@@ -1,3 +1,7 @@ 2008-10-06  Matthias Klose  <doko at ubuntu
+2008-10-07  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Don't rely on versioned cacao source directory.
+
 2008-10-06  Matthias Klose  <doko at ubuntu.com>
 
 	* generated/sun/misc/Version.java: Regenerate for 6b12.
diff -r d6c8840e4167 -r e4575e17609d Makefile.am
--- a/Makefile.am	Mon Oct 06 12:02:04 2008 +0200
+++ b/Makefile.am	Tue Oct 07 14:11:49 2008 +0200
@@ -533,6 +533,8 @@ if !USE_SYSTEM_CACAO
 	then \
 	  mkdir cacao ; \
 	  $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \
+	  dir=$$(basename cacao/cacao-*) ; \
+	  ln -s $$dir cacao/cacao ; \
 	fi
 endif
 endif
@@ -1316,7 +1318,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 && \
 	./configure \
 	  --prefix=$(abs_top_builddir)/cacao/install \
 	  --with-java-runtime-library=openjdk \