[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-118-gdb7421a

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  db7421a851967db16a5d7c9ddd6a11b50e321d77 (commit)
      from  891eb88a333ba5ece9d617612402bb07e2b61e05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit db7421a851967db16a5d7c9ddd6a11b50e321d77
Author: Sébastien Szymanski <ss...@us...>
Date:   Mon Feb 17 14:01:10 2014 +0100

    [BUILD] Fix Qt version detection to set ARMADEUS_QT_VERSION variable.

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0aad68b..85b440c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_QT),y)
 ARMADEUS_QT_MAKEFILE:=package/qt/qt.mk
-ARMADEUS_QT_VERSION:=$(shell grep "QT_VERSION =" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d = -f 2)
+ARMADEUS_QT_VERSION_MAJOR:=$(shell grep "QT_VERSION_MAJOR =" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d ' ' -f 3)
+ARMADEUS_QT_VERSION:=$(ARMADEUS_QT_VERSION_MAJOR)"."$(shell grep "QT_VERSION =" $(BUILDROOT_DIR)/$(ARMADEUS_QT_MAKEFILE) 2>/dev/null | cut -d '.' -f 2)
 ARMADEUS_QT_VERSION:=$(strip $(ARMADEUS_QT_VERSION))
 else
 ARMADEUS_QT_VERSION:=QT_NOT_INSTALLED


hooks/post-receive
-- 
armadeus