diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2023-05-09 22:34:39 +0200 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-05-10 02:28:35 +0100 |
| commit | ec88652cbefa9ce7fffaa1f5ab48ec6b772be106 (patch) | |
| tree | 0122f7b8bc7a7483b0337358a3a7181a3cd7820b | |
| parent | Delete remnants of CONF_LIBDIR (diff) | |
| download | portage-ec88652c.tar.gz portage-ec88652c.tar.bz2 portage-ec88652c.zip | |
einstall: Make EI_DESTLIBDIR a local variable and rename it
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Closes: https://github.com/gentoo/portage/pull/1033
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | bin/phase-helpers.sh | 7 |
1 files 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 |