From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 22 May 2007 13:13:49 +0000 (-0000)
Subject: fix from James C. Georgas to not modify EXTRA_EINSTALL #178544 (trunk r6552:6553)
X-Git-Tag: v2.1.2.8~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75960eeba2f1078aa334b6510d04e52545acdf48;p=portage.git

fix from James C. Georgas to not modify EXTRA_EINSTALL #178544 (trunk r6552:6553)

svn path=/main/branches/2.1.2/; revision=6573
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 1f4877761..2590fcd9a 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -584,6 +584,7 @@ econf() {
 
 einstall() {
 	# CONF_PREFIX is only set if they didn't pass in libdir above.
+	local LOCAL_EXTRA_EINSTALL="${EXTRA_EINSTALL}"
 	LIBDIR_VAR="LIBDIR_${ABI}"
 	if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
 		CONF_LIBDIR="${!LIBDIR_VAR}"
@@ -592,7 +593,7 @@ einstall() {
 	if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
 		EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}"
 		EI_DESTLIBDIR="$(strip_duplicate_slashes ${EI_DESTLIBDIR})"
-		EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${EXTRA_EINSTALL}"
+		LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}"
 		unset EI_DESTLIBDIR
 	fi
 
@@ -604,7 +605,7 @@ einstall() {
 				localstatedir="${D}/var/lib" \
 				mandir="${D}/usr/share/man" \
 				sysconfdir="${D}/etc" \
-				${EXTRA_EINSTALL} \
+				${LOCAL_EXTRA_EINSTALL} \
 				"$@" install
 		fi
 		make prefix="${D}/usr" \
@@ -613,7 +614,7 @@ einstall() {
 			localstatedir="${D}/var/lib" \
 			mandir="${D}/usr/share/man" \
 			sysconfdir="${D}/etc" \
-			${EXTRA_EINSTALL} \
+			${LOCAL_EXTRA_EINSTALL} \
 			"$@" install || die "einstall failed"
 	else
 		die "no Makefile found"