On a second thought it's much better if portage makes sure it can find

its own binaries itself.  This also solves problems during
bootstrapping, since the portage binpath now always ends up last.

svn path=/main/branches/prefix/; revision=5144

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 03fa09cd702d6f032e70bf3cd6ebe693fc484f72..81c6a0223f0cd6eca3f918d5395610983c9cc3f0 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -46,7 +46,7 @@ alias restore_IFS='if [ "${old_IFS:-unset}" != "unset" ]; then IFS="${old_IFS}";
 OCC="$CC"
 OCXX="$CXX"
 
-export PATH="${DEFAULT_PATH}:${ROOTPATH}"
+export PATH="${DEFAULT_PATH}:${PORTAGE_BIN_PATH}:${ROOTPATH}"
 [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}:$PATH"
 
 source "@PORTAGE_BASE@"/bin/isolated-functions.sh &>/dev/null

diff --git a/configure.in b/configure.in
index d6f2a51cca8981064f83832078697328d8fa8845..1ab4345b568014744ac4b0660b0aa8f1c12dc57a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -202,7 +202,7 @@ AC_HELP_STRING([--with-offset-prefix], [specify the installation prefix for all
 [DOMAIN_PREFIX=$withval],
 [DOMAIN_PREFIX='/'])
 
-DEFAULT_PATH="${DOMAIN_PREFIX}/bin:${DOMAIN_PREFIX}/sbin:${DOMAIN_PREFIX}/usr/bin:${DOMAIN_PREFIX}usr/sbin:${prefix}/bin:${prefix}/lib/portage/bin"
+DEFAULT_PATH="${DOMAIN_PREFIX}/bin:${DOMAIN_PREFIX}/sbin:${DOMAIN_PREFIX}/usr/bin:${DOMAIN_PREFIX}usr/sbin:${prefix}/bin"
 AC_ARG_WITH(default-path, 
 AC_HELP_STRING([--with-default-path], [specify additional PATHs available to the portage build environment ]),
 [DEFAULT_PATH="${DEFAULT_PATH}":$withval],