diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-21 15:37:00 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-21 15:37:00 +0000 |
| commit | a45bfbeac8e4f506840fdd2d913b86114ffae93a (patch) | |
| tree | df204178d36b7327c61e8fd62390600f28ce6b79 | |
| parent | 2021-03-21 15:21:13 UTC (diff) | |
| parent | autotools.eclass: config_rpath_update(): Fix path to config.rpath. (diff) | |
| download | gentoo-a45bfbeac8e4f506840fdd2d913b86114ffae93a.tar.gz gentoo-a45bfbeac8e4f506840fdd2d913b86114ffae93a.tar.bz2 gentoo-a45bfbeac8e4f506840fdd2d913b86114ffae93a.zip | |
Merge updates from master
| -rw-r--r-- | eclass/autotools.eclass | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 08c72cd77953..4ae360aa24d4 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -447,7 +447,16 @@ eautopoint() { # use gettext directly. So we have to copy it in manually since # we can't let `autopoint` do it for us. config_rpath_update() { - local dst src=$(type -P gettext | sed 's:bin/gettext:share/gettext/config.rpath:') + local dst src + + case ${EAPI:-0} in + 0|1|2|3|4|5|6) + src="${EPREFIX}/usr/share/gettext/config.rpath" + ;; + *) + src="${BROOT}/usr/share/gettext/config.rpath" + ;; + esac [[ $# -eq 0 ]] && set -- $(find -name config.rpath) [[ $# -eq 0 ]] && return 0 |