Mercurial > hg > release > icedtea-1.10
changeset 1848:9a8c3c90bdb2
2009-05-29 Xerxes R?nby <xerxes@zafena.se>
* Makefile.am (CACAO_SRC_ZIP): changed to download the .tar.bz2
file that matches the CACAO_MD5SUM.
(stamps/extract-cacao.stamp): explicit unpack .tar.bz2 using tar xjf.
author | Xerxes R?nby <xerxes@zafena.se> |
---|---|
date | Fri, 29 May 2009 15:28:39 +0200 |
parents | b65dc786ec65 |
children | ad579e9833cc |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 29 10:09:16 2009 +0200 +++ b/ChangeLog Fri May 29 15:28:39 2009 +0200 @@ -1,3 +1,9 @@ +2009-05-29 Xerxes RĂ„nby <xerxes@zafena.se> + + * Makefile.am (CACAO_SRC_ZIP): changed to download the .tar.bz2 + file that matches the CACAO_MD5SUM. + (stamps/extract-cacao.stamp): explicit unpack .tar.bz2 using tar xjf. + 2009-05-29 Matthias Klose <doko@ubuntu.com> * patches/icedtea-fonts.patch: Update fontconfig for Ubuntu.
--- a/Makefile.am Fri May 29 10:09:16 2009 +0200 +++ b/Makefile.am Fri May 29 15:28:39 2009 +0200 @@ -1769,7 +1769,7 @@ if USE_ALT_CACAO_SRC_ZIP CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) else - CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz + CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 endif stamps/download.stamp: stamps/hgforest.stamp @@ -2236,7 +2236,7 @@ if ! test -d cacao ; \ then \ mkdir cacao ; \ - $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \ + $(TAR) xjf $(CACAO_SRC_ZIP) -C cacao ; \ dir=$$(basename cacao/cacao-*) ; \ ln -s $$dir cacao/cacao ; \ cd cacao/cacao ; \