toolchain.eclass: prefixify helper scripts.

  Directory prefixify part 2.

Bug: 531610

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 40759f59daf2c39a915f78b3cd3f6f7ee116f0b6..17950c1068ecdc402422e3c524a05622464fe74c 100644 (file)
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -8,7 +8,7 @@ DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/"
 RESTRICT="strip" # cross-compilers need controlled stripping
 
-inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator
+inherit eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs versionator prefix
 
 if [[ ${PV} == *_pre9999* ]] ; then
        EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git"
@@ -1764,10 +1764,10 @@ toolchain_src_install() {
        # Rather install the script, else portage with changing $FILESDIR
        # between binary and source package borks things ....
        if ! is_crosscompile ; then
-               insinto "${DATAPATH}"
-               newins "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la fixlafiles.awk || die
-               exeinto "${DATAPATH}"
-               doexe "${GCC_FILESDIR}"/fix_libtool_files.sh || die
+               insinto "${DATAPATH#${EPREFIX}}"
+               newins "$(prefixify_ro "${GCC_FILESDIR}"/awk/fixlafiles.awk-no_gcc_la)" fixlafiles.awk || die
+               exeinto "${DATAPATH#${EPREFIX}}"
+               doexe "$(prefixify_ro "${GCC_FILESDIR}"/fix_libtool_files.sh)" || die
                doexe "${GCC_FILESDIR}"/c{89,99} || die
        fi