Bug #210449 - Reset exeinto(), docinto(), insinto(), and into() state

variables in case the user is running the install phase multiple times
consecutively via the ebuild command. (trunk r9357)

svn path=/main/branches/2.1.2/; revision=9531

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 3cf834f6be3f9c76ad029991d7535c443e72c824..23d0b619a5f96b3a66666ebe8f268b2a93e39800 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -966,6 +966,15 @@ dyn_install() {
        #some packages uses an alternative to $S to build in, cause
        #our libtool to create problematic .la files
        export PWORKDIR="$WORKDIR"
+
+       # Reset exeinto(), docinto(), insinto(), and into() state variables
+       # in case the user is running the install phase multiple times
+       # consecutively via the ebuild command.
+       export DESTTREE=/usr
+       export INSDESTTREE=""
+       export _E_EXEDESTTREE_=""
+       export _E_DOCDESTTREE_=""
+
        ebuild_phase src_install
        touch "${PORTAGE_BUILDDIR}/.installed"
        vecho ">>> Completed installing ${PF} into ${D}"