aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-02 02:32:20 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-02 02:32:20 +0000
commit5c45afccf63ea8e0a2e84d6efaa4a3946a6ebb81 (patch)
treeca4ba35606f5e4fc0aa40e926299ddaf376fff27
parentc336828f2dab7dbb9ef635a080abf89c428ef431 (diff)
downloadpaludis-5c45afccf63ea8e0a2e84d6efaa4a3946a6ebb81.tar.gz
paludis-5c45afccf63ea8e0a2e84d6efaa4a3946a6ebb81.tar.xz
Make econf not pass in parameters unnecessarily
-rw-r--r--ebuild/build_functions.bash11
1 files changed, 8 insertions, 3 deletions
diff --git a/ebuild/build_functions.bash b/ebuild/build_functions.bash
index dc416bf..1226486 100644
--- a/ebuild/build_functions.bash
+++ b/ebuild/build_functions.bash
@@ -36,8 +36,8 @@ econf()
done
fi
- [[ -z "${CBUILD}" ]] && LOCAL_EXTRA_ECONF="--build=${CBUILD} ${LOCAL_EXTRA_ECONF}"
- [[ -z "${CTARGET}" ]] && LOCAL_EXTRA_ECONF="--target=${CTARGET} ${LOCAL_EXTRA_ECONF}"
+ [[ -z "${CBUILD}" ]] || LOCAL_EXTRA_ECONF="--build=${CBUILD} ${LOCAL_EXTRA_ECONF}"
+ [[ -z "${CTARGET}" ]] || LOCAL_EXTRA_ECONF="--target=${CTARGET} ${LOCAL_EXTRA_ECONF}"
local cmd="${ECONF_SOURCE}/configure"
cmd="${cmd} --prefix=/usr"
@@ -48,7 +48,12 @@ econf()
cmd="${cmd} --sysconfdir=/etc"
cmd="${cmd} --localstatedir=/var/lib"
# Check that this is actually what's wanted for multilib etc.
- cmd="${cmd} --libdir=${PREFIX}/$(ebuild_get_libdir)"
+ if [[ -n "${ABI}" ]] ; then
+ local v="LIBDIR_${ABI}"
+ if [[ -n "${!v}" ]] ; then
+ cmd="${cmd} --libdir=${PREFIX}/$(ebuild_get_libdir)"
+ fi
+ fi
cmd="${cmd} $@ ${LOCAL_EXTRA_ECONF}"