[gentoo-commits] repo/gentoo:master commit in: eclass/

[Lars Wendler]

commit:     6cc76ab7680a0ed328810f9dcea63dd859c26ad6
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 14:16:36 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 14:17:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cc76ab7

autotools.eclass: Simplified config.{guess,sub} handling a bit

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 eclass/autotools.eclass | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index adeef7b17be..d7ce23bfdf3 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -357,17 +357,18 @@ eautoconf() {
                eqawarn "when it finds this file.  See 
https://bugs.gentoo.org/426262 for details."
        fi
 
-       # Install config.guess and config.sub which are required by many macros 
in Autoconf >=2.70.
+       # Install config.guess and config.sub which are required by many macros
+       # in Autoconf >=2.70.
+       local gnuconfig
        case ${EAPI:-0} in
                0|1|2|3|4|5|6)
-                       cp "${EPREFIX}/usr/share/gnuconfig/config.guess" . || 
die
-                       cp "${EPREFIX}/usr/share/gnuconfig/config.sub" . || die
-                       ;;
+                       gnuconfig="${EPREFIX}/usr/share/gnuconfig"
+               ;;
                *)
-                       cp "${BROOT}/usr/share/gnuconfig/config.guess" . || die
-                       cp "${BROOT}/usr/share/gnuconfig/config.sub" . || die
-                       ;;
+                       gnuconfig="${BROOT}/usr/share/gnuconfig"
+               ;;
        esac
+       cp "${gnuconfig}"/config.{guess,sub} . || die
 
        autotools_run_tool --at-m4flags autoconf "$@"
 }