commit: fc8b43b1950fe8d3db8a8349c97024b764cfdb19
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 18 14:23:22 2015 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 14:23:22 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fc8b43b1
[qmake-utils.eclass] Minor improvements to qt{4,5}_get_bindir().
---
eclass/qmake-utils.eclass | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index cc11970..725a5a5 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -16,6 +16,25 @@ _QMAKE_UTILS_ECLASS=1
inherit eutils multilib toolchain-funcs
+# @FUNCTION: qt4_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 binaries are installed.
+qt4_get_bindir() {
+ local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
+ if [[ -d ${qtbindir} ]]; then
+ echo ${qtbindir}
+ else
+ echo ${EPREFIX}/usr/bin
+ fi
+}
+
+# @FUNCTION: qt5_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 binaries are installed.
+qt5_get_bindir() {
+ echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
+}
+
# @FUNCTION: qmake-utils_find_pro_file
# @RETURN: zero or one qmake .pro file names
# @INTERNAL
@@ -51,25 +70,6 @@ qmake-utils_find_pro_file() {
esac
}
-# @FUNCTION qt4_get_bindir
-# @DESCRIPTION:
-# Get the correct location of Qt4's installed binaries.
-qt4_get_bindir() {
- local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
- if [[ -x ${qtbindir} ]]; then
- echo ${qtbindir}
- else
- echo ${EPREFIX}/usr/bin
- fi
-}
-
-# @FUNCTION qt5_get_bindir
-# @DESCRIPTION:
-# Get the correct location of Qt5's installed binaries.
-qt5_get_bindir() {
- echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
-}
-
# @VARIABLE: EQMAKE4_EXCLUDE
# @DEFAULT_UNSET
# @DESCRIPTION:
