summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-18 18:54:46 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-18 18:54:46 +0000
commit4c52fd39e1076078f1b3446acd26058d6e10cf71 (patch)
tree5d7c870c5d0f709448a6cdcc9efaf850aaab181c
parent185cb89c85e3a1f23fadc0ac575bed79af58ef06 (diff)
downloadportage-4c52fd39e1076078f1b3446acd26058d6e10cf71.tar.gz
portage-4c52fd39e1076078f1b3446acd26058d6e10cf71.tar.bz2
portage-4c52fd39e1076078f1b3446acd26058d6e10cf71.zip
Fix messages broken in r14616. Thanks to Arfrever for reporting and thanks to
Jonathan Callen <abcd@g.o> for this patch. svn path=/main/trunk/; revision=14675
-rwxr-xr-xbin/ebuild.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 6687c8257..38c0c78de 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -915,7 +915,7 @@ dyn_prepare() {
[ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE"
ebuild_phase pre_src_prepare
- vecho ">>> Preparing source in $srcdir ..."
+ vecho ">>> Preparing source in $PWD ..."
ebuild_phase src_prepare
touch "$PORTAGE_BUILDDIR"/.prepared
vecho ">>> Source prepared."
@@ -947,7 +947,7 @@ dyn_configure() {
[ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE"
ebuild_phase pre_src_configure
- vecho ">>> Configuring source in $srcdir ..."
+ vecho ">>> Configuring source in $PWD ..."
ebuild_phase src_configure
touch "$PORTAGE_BUILDDIR"/.configured
vecho ">>> Source configured."
@@ -980,7 +980,7 @@ dyn_compile() {
[ -n "$EBUILD_PHASE" ] && rm -f "$T/logging/$EBUILD_PHASE"
ebuild_phase pre_src_compile
- vecho ">>> Compiling source in ${srcdir} ..."
+ vecho ">>> Compiling source in $PWD ..."
ebuild_phase src_compile
touch "$PORTAGE_BUILDDIR"/.compiled
vecho ">>> Source compiled."
@@ -1042,7 +1042,6 @@ dyn_install() {
ebuild_phase pre_src_install
rm -rf "${PORTAGE_BUILDDIR}/image"
mkdir "${PORTAGE_BUILDDIR}/image"
- local srcdir
if [[ -d $S ]] ; then
cd "${S}"
elif hasq $EAPI 0 1 2; then