From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 18 Oct 2009 03:56:59 +0000 (-0000)
Subject: Fix einstall() change from previous commit, for compatibility with empty
X-Git-Tag: v2.1.7.2~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d5b0cd1a5e8ff576b126ca73a062b791ada16cf7;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.
(trunk r14622)

svn path=/main/branches/2.1.7/; revision=14650
---

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