[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     2773b2b244cb30bfd1835f7978835a973900e567
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  5 13:07:01 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul  5 13:07:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2773b2b2

[eclass] Shorten die message.

 eclass/qt4-build-multilib.eclass | 3 ++-
 eclass/qt5-build.eclass          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index baac03c..aef1641 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -640,7 +640,8 @@ qt4_qmake() {
 		CONFIG+=nostrip \
 		LIBS+=-L"${QT4_LIBDIR}" \
 		"${projectdir}" \
-		|| die "qmake failed (${projectdir})"
+		"$@" \
+		|| die "qmake failed (${projectdir#${S}/})"
 }
 
 # @FUNCTION: qt4_install_module_qconfigs

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index ef4cdfb..fd9406e 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -684,7 +684,7 @@ qt5_qmake() {
 		QMAKE_LFLAGS_DEBUG= \
 		"${projectdir}" \
 		"$@" \
-		|| die "qmake failed (${projectdir})"
+		|| die "qmake failed (${projectdir#${S}/})"
 }
 
 # @FUNCTION: qt5_install_module_qconfigs