diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-17 06:55:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-17 06:55:36 +0000 |
| commit | 3a2caa9c18864add6b78306aedb0aa73d77a30d5 (patch) | |
| tree | 74889fc4c90425e8de78d0431129342552517a30 | |
| parent | 455bd714054bba09fc3931d3fd7cb73dd3cece45 (diff) | |
| download | portage-3a2caa9c18864add6b78306aedb0aa73d77a30d5.tar.gz portage-3a2caa9c18864add6b78306aedb0aa73d77a30d5.tar.bz2 portage-3a2caa9c18864add6b78306aedb0aa73d77a30d5.zip | |
Fix einstall() change from previous commit, for compatibility with empty
but set CONF_PREFIX. Thanks to Jonathan Callen <abcd@g.o> for reporting.
svn path=/main/trunk/; revision=14622
| -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 909eee705..771d49d2c 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}" |