commit: ec88652cbefa9ce7fffaa1f5ab48ec6b772be106 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue May 9 20:34:39 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed May 10 01:28:35 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ec88652c
einstall: Make EI_DESTLIBDIR a local variable and rename it Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> Closes: https://github.com/gentoo/portage/pull/1033 Signed-off-by: Sam James <sam <AT> gentoo.org> bin/phase-helpers.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index e3fca6757..af96b73e4 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -757,10 +757,9 @@ einstall() { fi if [[ -n "${libdir}" && "${CONF_PREFIX:+set}" = set ]]; then - EI_DESTLIBDIR="${D%/}/${CONF_PREFIX}/${libdir}" - EI_DESTLIBDIR="$(__strip_duplicate_slashes "${EI_DESTLIBDIR}")" - LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}" - unset EI_DESTLIBDIR + local destlibdir="${D%/}/${CONF_PREFIX}/${libdir}" + destlibdir="$(__strip_duplicate_slashes "${destlibdir}")" + LOCAL_EXTRA_EINSTALL="libdir=${destlibdir} ${LOCAL_EXTRA_EINSTALL}" fi if [[ -f Makefile || -f GNUmakefile || -f makefile ]] ; then
