From d5b0cd1a5e8ff576b126ca73a062b791ada16cf7 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 18 Oct 2009 03:56:59 +0000 Subject: [PATCH] Fix einstall() change from previous commit, for compatibility with empty but set CONF_PREFIX. Thanks to Jonathan Callen for reporting. (trunk r14622) svn path=/main/branches/2.1.7/; revision=14650 --- bin/ebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 4ce1eba55..e7236a0c1 100755 --- 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}" -- 2.26.2