| 1 |
commit: 9dee9d50c541da4f5282ce6624d82be64bb88a37 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 22 09:51:06 2011 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 22 09:51:06 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9dee9d50 |
| 7 |
|
| 8 |
make.globals: bring back hardcoded EPREFIX (bug #395633) |
| 9 |
|
| 10 |
--- |
| 11 |
cnf/make.globals | 4 ++-- |
| 12 |
1 files changed, 2 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/cnf/make.globals b/cnf/make.globals |
| 15 |
index 78ca91b..5a2c612 100644 |
| 16 |
--- a/cnf/make.globals |
| 17 |
+++ b/cnf/make.globals |
| 18 |
@@ -30,13 +30,13 @@ ACCEPT_LICENSE="* -@EULA" |
| 19 |
ACCEPT_PROPERTIES="*" |
| 20 |
|
| 21 |
# Repository Paths |
| 22 |
-PORTDIR=/usr/portage |
| 23 |
+PORTDIR="@PORTAGE_EPREFIX@/usr/portage" |
| 24 |
DISTDIR=${PORTDIR}/distfiles |
| 25 |
PKGDIR=${PORTDIR}/packages |
| 26 |
RPMDIR=${PORTDIR}/rpm |
| 27 |
|
| 28 |
# Temporary build directory |
| 29 |
-PORTAGE_TMPDIR=/var/tmp |
| 30 |
+PORTAGE_TMPDIR="@PORTAGE_EPREFIX@/var/tmp" |
| 31 |
|
| 32 |
# Fetching command (3 tries, passive ftp for firewall compatibility) |
| 33 |
FETCHCOMMAND="wget -t 3 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" |
Archives