diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-01-19 03:47:55 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-01-19 03:47:55 +0000 |
| commit | aeb08ced029c6046e8af79213a73717c8b85cf2f (patch) | |
| tree | eee2d04b2ab958ce4b42e586111fa2ea034ef50d /eclass | |
| parent | Add all but the last two modular X licenses. (diff) | |
| download | gentoo-2-aeb08ced029c6046e8af79213a73717c8b85cf2f.tar.gz gentoo-2-aeb08ced029c6046e8af79213a73717c8b85cf2f.tar.bz2 gentoo-2-aeb08ced029c6046e8af79213a73717c8b85cf2f.zip | |
Made fix-i386-libdir make a symlink back to i386.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java.eclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/java.eclass b/eclass/java.eclass index a8f542b992c4..977cdaeca0b5 100644 --- a/eclass/java.eclass +++ b/eclass/java.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.26 2006/01/19 03:29:31 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java.eclass,v 1.27 2006/01/19 03:47:55 nichoj Exp $ # # Author: Karl Trygve Kalleberg <karltk@gentoo.org> @@ -129,10 +129,12 @@ fix-i386-dir() { host=${host%%-*} if [[ ${host} != i386 ]]; then - local orig_dir="${D}/${libdir}/i386" - local new_dir="${D}/${libdir}/${host}" - mv ${orig_dir} ${new_dir} || + local orig_dir="${libdir}/i386" + local new_dir="${libdir}/${host}" + mv ${D}/${orig_dir} ${D}/${new_dir} || die "Failed to move ${orig_dir} to ${new_dir}" + dosym ${host} ${orig_dir} || die "Failed to dosym" + sed -i -e "s/i386/${host}/g" \ ${D}/etc/env.d/java/20${VMHANDLE} || die "Failed to sed" |