commit:     154f21fa9b3677d079ddf1ac5bad5cbedf792ee7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 21:36:35 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 21:36:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=154f21fa

qt5-build.eclass: adapt qmake installation target name for 5.7

Gentoo-Bug: 566196

 eclass/qt5-build.eclass | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 31a5b65..baab86f 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -277,7 +277,15 @@ qt5-build_src_install() {
        if [[ ${PN} == qtcore ]]; then
                pushd "${QT5_BUILD_DIR}" >/dev/null || die
 
-               set -- emake INSTALL_ROOT="${D}" 
install_{global_docs,mkspecs,qmake,syncqt}
+               local qmake_install_target=install_qmake
+               if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
+                       # qmake/qmake-aux.pro
+                       
qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
+               fi
+
+               set -- emake INSTALL_ROOT="${D}" \
+                       ${qmake_install_target} \
+                       install_{syncqt,mkspecs,global_docs}
                einfo "Running $*"
                "$@"
 

Reply via email to