Mercurial > hg > release > icedtea6-1.3
changeset 1075:e4575e17609d
2008-10-07 Matthias Klose <doko@ubuntu.com>
* Makefile.am: Don't rely on versioned cacao source directory.
| author | doko@ubuntu.com |
|---|---|
| date | Tue, 07 Oct 2008 14:11:49 +0200 |
| parents | d6c8840e4167 |
| children | ab8aa9425fc4 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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-07 Matthias Klose <doko@ubuntu.com> + + * Makefile.am: Don't rely on versioned cacao source directory. + 2008-10-06 Matthias Klose <doko@ubuntu.com> * generated/sun/misc/Version.java: Regenerate for 6b12.
--- 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 @@ 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/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 \