From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 17 Oct 2009 06:55:36 +0000 (-0000)
Subject: Fix einstall() change from previous commit, for compatibility with empty
X-Git-Tag: v2.2_rc47~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a2caa9c18864add6b78306aedb0aa73d77a30d5;p=portage.git

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
---

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}"