Mercurial > hg > release > icedtea6-1.4
changeset 1281:4f248bc51029
2008-12-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am:
Remove the HotSpot directory while extracting
OpenJDK and then only when HSBUILD is not original.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 17 Dec 2008 18:03:57 +0000 |
| parents | 30c77d225ff7 |
| children | cedcd6958a6f |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Dec 17 12:02:26 2008 -0500 +++ b/ChangeLog Wed Dec 17 18:03:57 2008 +0000 @@ -1,3 +1,9 @@ +2008-12-09 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * Makefile.am: + Remove the HotSpot directory while extracting + OpenJDK and then only when HSBUILD is not original. + 2008-12-17 Gary Benson <gbenson@redhat.com> * contrib/mixtec-hacks.patch: Updated.
--- a/Makefile.am Wed Dec 17 12:02:26 2008 -0500 +++ b/Makefile.am Wed Dec 17 18:03:57 2008 +0000 @@ -687,15 +687,20 @@ mkdir openjdk ; \ $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \ chmod -R ug+w openjdk ; \ + if test "x${HSBUILD}" != "xoriginal"; then \ + rm -rf openjdk/hotspot ; \ + fi ; \ sh $(abs_top_srcdir)/fsg.sh ; \ fi if WITH_ALT_HSBUILD if test -e ${HOTSPOT_SRC_ZIP} ; \ then \ - rm -rf openjdk/hotspot ; \ - $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \ - chmod -R ug+w hotspot-* ; \ - mv hotspot-$$(cat $(abs_top_srcdir)/hotspot.map|grep $(HSBUILD)|cut -f2) openjdk/hotspot ; \ + if ! test -d openjdk/hotspot ; \ + then \ + $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \ + chmod -R ug+w hotspot-* ; \ + mv hotspot-$$(cat $(abs_top_srcdir)/hotspot.map|grep $(HSBUILD)|cut -f2) openjdk/hotspot ; \ + fi ; \ fi endif endif