diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:47:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:47:19 +0000 |
| commit | f6d435b8a12fc2b3994041fdf8755cd9bf8c4d57 (patch) | |
| tree | 423c23512722d6331c5a512c13edb25a87f4acd3 /bin/ebuild.sh | |
| parent | 5cc1bbb20e555a91d18f5efc8e324cf1d1249c1e (diff) | |
| download | portage-f6d435b8a12fc2b3994041fdf8755cd9bf8c4d57.tar.gz portage-f6d435b8a12fc2b3994041fdf8755cd9bf8c4d57.tar.bz2 portage-f6d435b8a12fc2b3994041fdf8755cd9bf8c4d57.zip | |
Escape globs in hasgq arguments in order to prevent bash from trying
to perform filename expansion. (trunk r12591)
svn path=/main/branches/2.1.6/; revision=12872
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 124fd35ab..301eb7949 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -486,9 +486,9 @@ econf() { if [[ -n ${ABI} && -n ${!LIBDIR_VAR} ]] ; then CONF_LIBDIR=${!LIBDIR_VAR} fi - if [[ -n ${CONF_LIBDIR} ]] && ! hasgq --libdir=* "$@" ; then - export CONF_PREFIX=$(hasg --exec-prefix=* "$@") - [[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(hasg --prefix=* "$@") + if [[ -n ${CONF_LIBDIR} ]] && ! hasgq --libdir=\* "$@" ; then + export CONF_PREFIX=$(hasg --exec-prefix=\* "$@") + [[ -z ${CONF_PREFIX} ]] && CONF_PREFIX=$(hasg --prefix=\* "$@") : ${CONF_PREFIX:=/usr} CONF_PREFIX=${CONF_PREFIX#*=} [[ ${CONF_PREFIX} != /* ]] && CONF_PREFIX="/${CONF_PREFIX}" |