diff options
| author |   Steven J Newbury <steve@snewbury.org.uk> | 2009-04-07 00:54:19 +0100 |
|---|---|---|
| committer | Steven J Newbury <steve@snewbury.org.uk> | 2009-04-07 00:54:19 +0100 |
| commit | a8f644ec7a31bf7d1e43db2cdc3b8057fb9c9d04 (patch) | |
| tree | b4984d617d5d03af71a6cb265936ffdb5c84ecca | |
| parent | Revert "Improve the detection of ${PN}-config files, hopefully it will catch" (diff) | |
| download | multilib-portage-a8f644ec7a31bf7d1e43db2cdc3b8057fb9c9d04.tar.gz multilib-portage-a8f644ec7a31bf7d1e43db2cdc3b8057fb9c9d04.tar.bz2 multilib-portage-a8f644ec7a31bf7d1e43db2cdc3b8057fb9c9d04.zip | |
Revert "Revert "Improve the detection of ${PN}-config files, hopefully it will catch""
This reverts commit 98b8b93c3094ab38acbfd7a93d0c6e5cb43e1ba4.
| -rw-r--r-- | eclass/multilib-native.eclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/eclass/multilib-native.eclass b/eclass/multilib-native.eclass index 2b9fd2c9e..10a342764 100644 --- a/eclass/multilib-native.eclass +++ b/eclass/multilib-native.eclass @@ -323,15 +323,15 @@ multilib-native_src_generic_sub() { KDE_S="${EMULTILIB_OKDE_S}" mycmakeargs="${EMULTILIB_Omycmakeargs}" - # handle old-style (non-PKG-CONFIG) *-config scripts + # handle old-style (non-PKG-CONFIG) *-config* scripts if [[ ${1} == "src_install" ]] && \ - ( [[ ${ABI} == "x86" ]] || [[ ${ABI} == "ppc32" ]] ); then - [[ -x "${D}/usr/bin/${PN}-config" ]] && \ - mv "${D}/usr/bin/${PN}-config" \ - "${D}/usr/bin/${PN}-config-${ABI}" - [[ -x "${D}/usr/bin/lib${PN}-config" ]] && \ - mv "${D}/usr/bin/lib${PN}-config" \ - "${D}/usr/bin/lib${PN}-config-${ABI}" + ! is_final_abi; then + local _config + for _config in $(find ${D}/usr/bin \ + -executable \ + -name '*${PN}-config*'); do + mv ${_config} ${_config}-${ABI} + done fi fi fi |