Mercurial > hg > release > icedtea6-1.4
changeset 1267:f22738446a8f
Fix use of find which breaks on Solaris.
2008-12-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am:
Don't use find to locate the hotspot directory,
explicitly use 'hotspot-' plus the changeset.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Tue, 09 Dec 2008 14:42:57 +0000 |
| parents | a8303cf14c13 |
| children | 62b109d14405 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Dec 09 08:27:15 2008 +0000 +++ b/ChangeLog Tue Dec 09 14:42:57 2008 +0000 @@ -1,3 +1,9 @@ +2008-12-09 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * Makefile.am: + Don't use find to locate the hotspot directory, + explicitly use 'hotspot-' plus the changeset. + 2008-12-09 Gary Benson <gbenson@redhat.com> * contrib/jck/compile-native-code.sh: Fix library paths.
--- a/Makefile.am Tue Dec 09 08:27:15 2008 +0000 +++ b/Makefile.am Tue Dec 09 14:42:57 2008 +0000 @@ -652,7 +652,7 @@ rm -rf openjdk/hotspot ; \ $(TAR) xf $(HOTSPOT_SRC_ZIP) ; \ chmod -R ug+w hotspot-* ; \ - mv $$(find -maxdepth 1 -name 'hotspot-*' -type d) openjdk/hotspot ; \ + mv hotspot-$$(cat $(abs_top_srcdir)/hotspot.map|grep $(HSBUILD)|cut -f2) openjdk/hotspot ; \ fi endif if WITH_CACAO