Mercurial > hg > release > icedtea6-1.8
changeset 1831:10d4e6ddaac9
PR icedtea/416: Don't use hardcoded tarball names.
2010-01-18 Andrew John Hughes <ahughes@redhat.com>
PR icedtea/416:
* Makefile.am:
Use $(OPENJDK_SRC_ZIP) and $(HOTSPOT_SRC_ZIP)
to determine names of tarballs rather than
hardcoding openjdk.tar.gz and hotspot.tar.gz
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 18 Jan 2010 20:12:25 +0000 |
| parents | 8972093fe4f7 |
| children | 98c88b32cdb4 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 18 20:14:00 2010 +0000 +++ b/ChangeLog Mon Jan 18 20:12:25 2010 +0000 @@ -4,6 +4,14 @@ Use AC_LANG_PUSH and AC_LANG_POP instead of deprecated SAVE and RESTORE macros. +2010-01-18 Andrew John Hughes <ahughes@redhat.com> + + PR icedtea/416: + * Makefile.am: + Use $(OPENJDK_SRC_ZIP) and $(HOTSPOT_SRC_ZIP) + to determine names of tarballs rather than + hardcoding openjdk.tar.gz and hotspot.tar.gz + 2010-01-17 Matthias Klose <doko@ubuntu.com> * patches/icedtea-sparc-trapsfix.patch: Merged sparc headers
--- a/Makefile.am Mon Jan 18 20:14:00 2010 +0000 +++ b/Makefile.am Mon Jan 18 20:12:25 2010 +0000 @@ -1795,8 +1795,10 @@ '--with-rmic=% '--with-additional-vms=% \ '--with-openjdk '--with-openjdk=% , \ $(CONFIGURE_ARGS)) \ - $(foreach i, openjdk hotspot, \ - $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz)) + $(if $(findstring --with-openjdk-src-zip=, $(CONFIGURE_ARGS)),, \ + --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP)) \ + $(if $(findstring --with-hotspot-src-zip=, $(CONFIGURE_ARGS)),, \ + --with-hotspot-src-zip=$(abs_top_builddir)/$(HOTSPOT_SRC_ZIP)) ADD_ZERO_EXTRA_BUILD_ENV = \ BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \