diff options
| author |   Karl Trygve Kalleberg <karltk@gentoo.org> | 2004-03-31 00:19:30 +0000 |
|---|---|---|
| committer | Karl Trygve Kalleberg <karltk@gentoo.org> | 2004-03-31 00:19:30 +0000 |
| commit | 2fe2de701007ef1fb4c49766d5c339c007a6c71a (patch) | |
| tree | ba6568e8151bd15b3818c975ecdb437f208521f2 /eclass | |
| parent | cvs commit (Manifest recommit) (diff) | |
| download | gentoo-2-2fe2de701007ef1fb4c49766d5c339c007a6c71a.tar.gz gentoo-2-2fe2de701007ef1fb4c49766d5c339c007a6c71a.tar.bz2 gentoo-2-2fe2de701007ef1fb4c49766d5c339c007a6c71a.zip | |
Adds more intelligence to java-pkg_jar-from.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-pkg.eclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/eclass/java-pkg.eclass b/eclass/java-pkg.eclass index 1ca591fc0e9a..7954fc464deb 100644 --- a/eclass/java-pkg.eclass +++ b/eclass/java-pkg.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.6 2004/01/25 03:56:09 strider Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg.eclass,v 1.7 2004/03/31 00:19:30 karltk Exp $ inherit base ECLASS=java-pkg @@ -193,11 +193,17 @@ java-pkg_jar-from() eerror "Installation problems with jars in ${pkg} - is it installed?" return 1 fi - if [ "`basename ${x}`" == "${jar}" ] ; then + if [ -z "${jar}" ] ; then + ln -sf ${x} $(basename ${x}) + elif [ "`basename ${x}`" == "${jar}" ] ; then ln -sf ${x} ${destjar} return 0 fi done - return 1 + if [ -z "${jar}" ] ; then + return 0 + else + return 1 + fi } |