diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-02-07 09:26:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-02-07 09:26:08 +0000 |
| commit | 2434d0f6c4ff64070e811ed64902ad6b0722d3b9 (patch) | |
| tree | 7fd70159bd69cbce2fbc090c5dbc7060d0cfb801 | |
| parent | 7342cc6c041f57777c80afe7b090253059848d95 (diff) | |
| download | portage-2434d0f6c4ff64070e811ed64902ad6b0722d3b9.tar.gz portage-2434d0f6c4ff64070e811ed64902ad6b0722d3b9.tar.bz2 portage-2434d0f6c4ff64070e811ed64902ad6b0722d3b9.zip | |
fix previous commit -- hasq isnt as cool as i thought and doesnt accept globs, so define a new hasg() func that does and use that
svn path=/main/trunk/; revision=12589
| -rwxr-xr-x | bin/ebuild.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 34e4f747b..2c46da3f9 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -455,6 +455,12 @@ strip_duplicate_slashes() { fi } +hasg() { + local x s=$1 + shift + for x ; do [[ ${x} == ${s} ]] && echo "${x}" && return 0 ; done + return 1 +} econf() { local x local LOCAL_EXTRA_ECONF="${EXTRA_ECONF}" @@ -491,7 +497,7 @@ econf() { CONF_LIBDIR="${!LIBDIR_VAR}" fi unset LIBDIR_VAR - if [ -n "${CONF_LIBDIR}" ] && ! hasq --libdir=* "$@" ; then + if [ -n "${CONF_LIBDIR}" ] && ! hasg --libdir=* "$@" ; then if [ "${*/--exec-prefix}" != "$*" ]; then local args="$(echo $*)" local -a pref=($(echo ${args/*--exec-prefix[= ]})) |