diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-09-22 14:52:36 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-09-22 14:52:36 +0000 |
| commit | 0453cd8c3bc9dc9253f0a6ad4ddee4d6af1733bb (patch) | |
| tree | 06f0168894e8effefa227b2c1409e423a6948848 | |
| parent | Force automake 1.9 (diff) | |
| download | gentoo-2-0453cd8c3bc9dc9253f0a6ad4ddee4d6af1733bb.tar.gz gentoo-2-0453cd8c3bc9dc9253f0a6ad4ddee4d6af1733bb.tar.bz2 gentoo-2-0453cd8c3bc9dc9253f0a6ad4ddee4d6af1733bb.zip | |
fixing check_license for explicit license checks.
| -rw-r--r-- | eclass/eutils.eclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index d793f631dc8d..d773f30453c2 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.198 2005/09/18 22:02:59 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.199 2005/09/22 14:52:36 wolf31o2 Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -1136,12 +1136,12 @@ check_license() { if [ -z "${lic}" ] ; then lic="${PORTDIR}/licenses/${LICENSE}" else - if [ -e "${PORTDIR}/licenses/${src}" ] ; then - lic="${PORTDIR}/licenses/${src}" - elif [ -e "${PWD}/${src}" ] ; then - lic="${PWD}/${src}" - elif [ -e "${src}" ] ; then - lic="${src}" + if [ -e "${PORTDIR}/licenses/${lic}" ] ; then + lic="${PORTDIR}/licenses/${lic}" + elif [ -e "${PWD}/${lic}" ] ; then + lic="${PWD}/${lic}" + elif [ -e "${lic}" ] ; then + lic="${lic}" fi fi [ ! -f "${lic}" ] && die "Could not find requested license ${src}" |