| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-28 09:21:51 +0000 (Fri, 28 Mar 2008) |
| 3 |
New Revision: 9531 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/ebuild.sh |
| 7 |
Log: |
| 8 |
Bug #210449 - Reset exeinto(), docinto(), insinto(), and into() state |
| 9 |
variables in case the user is running the install phase multiple times |
| 10 |
consecutively via the ebuild command. (trunk r9357) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/ebuild.sh |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/ebuild.sh 2008-03-28 09:12:49 UTC (rev 9530) |
| 16 |
+++ main/branches/2.1.2/bin/ebuild.sh 2008-03-28 09:21:51 UTC (rev 9531) |
| 17 |
@@ -966,6 +966,15 @@ |
| 18 |
#some packages uses an alternative to $S to build in, cause |
| 19 |
#our libtool to create problematic .la files |
| 20 |
export PWORKDIR="$WORKDIR" |
| 21 |
+ |
| 22 |
+ # Reset exeinto(), docinto(), insinto(), and into() state variables |
| 23 |
+ # in case the user is running the install phase multiple times |
| 24 |
+ # consecutively via the ebuild command. |
| 25 |
+ export DESTTREE=/usr |
| 26 |
+ export INSDESTTREE="" |
| 27 |
+ export _E_EXEDESTTREE_="" |
| 28 |
+ export _E_DOCDESTTREE_="" |
| 29 |
+ |
| 30 |
ebuild_phase src_install |
| 31 |
touch "${PORTAGE_BUILDDIR}/.installed" |
| 32 |
vecho ">>> Completed installing ${PF} into ${D}" |
| 33 |
|
| 34 |
-- |
| 35 |
gentoo-commits@l.g.o mailing list |
Archives