From eb142416cb011900caea316b21493912db9413fa Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 15 Aug 2007 20:25:11 +0000 Subject: [PATCH] cd to ${WORKDIR} if the ${S} directory does not exist. (branches/2.1.2 r7557 and r7588) svn path=/main/branches/2.1.2.9/; revision=7612 --- bin/ebuild.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 3697ccbc8..a46db56be 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -972,6 +972,8 @@ dyn_compile() { if [ -d "${S}" ]; then srcdir=${S} cd "${S}" + else + cd "${WORKDIR}" fi #our custom version of libtool uses $S and $D to fix #invalid paths in .la files @@ -1029,6 +1031,8 @@ dyn_test() { trap "abort_test" SIGINT SIGQUIT if [ -d "${S}" ]; then cd "${S}" + else + cd "${WORKDIR}" fi if ! hasq test $FEATURES && [ "${EBUILD_FORCE_TEST}" != "1" ]; then vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}" @@ -1065,6 +1069,8 @@ dyn_install() { mkdir "${PORTAGE_BUILDDIR}/image" if [ -d "${S}" ]; then cd "${S}" + else + cd "${WORKDIR}" fi vecho vecho ">>> Install ${PF} into ${D} category ${CATEGORY}" -- 2.26.2