Fix einstall() change from previous commit, for compatibility with empty

but set CONF_PREFIX. Thanks to Jonathan Callen <abcd@g.o> for reporting.

svn path=/main/trunk/; revision=14622

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 909eee70588fbe0f3d96a1cd5d8b6ff20cd86a34..771d49d2cd8e76090847c7ba6096c386642c3da8 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -565,7 +565,7 @@ einstall() {
                CONF_LIBDIR="${!LIBDIR_VAR}"
        fi
        unset LIBDIR_VAR
-       if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX+set}" = set ]; then
+       if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:+set}" = set ]; then
                EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}"
                EI_DESTLIBDIR="$(strip_duplicate_slashes ${EI_DESTLIBDIR})"
                LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}"