diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-10-18 03:56:59 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-10-18 03:56:59 +0000 |
commit | d5b0cd1a5e8ff576b126ca73a062b791ada16cf7 (patch) | |
tree | 473a4db5f9830fb8822b103123fbbeea5f753171 | |
parent | 2b0464af81fcb134111fe4ec5058a0e636b68471 (diff) | |
download | portage-d5b0cd1a5e8ff576b126ca73a062b791ada16cf7.tar.gz portage-d5b0cd1a5e8ff576b126ca73a062b791ada16cf7.tar.bz2 portage-d5b0cd1a5e8ff576b126ca73a062b791ada16cf7.zip |
Fix einstall() change from previous commit, for compatibility with empty
but set CONF_PREFIX. Thanks to Jonathan Callen <abcd@g.o> for reporting.
(trunk r14622)
svn path=/main/branches/2.1.7/; revision=14650
-rwxr-xr-x | bin/ebuild.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 4ce1eba55..e7236a0c1 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -565,7 +565,7 @@ einstall() { CONF_LIBDIR="${!LIBDIR_VAR}" fi unset LIBDIR_VAR - if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX+set}" = set ]; then + if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:+set}" = set ]; then EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}" EI_DESTLIBDIR="$(strip_duplicate_slashes ${EI_DESTLIBDIR})" LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}" |