[oe-commits] Otavio Salvador : qconnman: fix order of qmake variable settings

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: b37fc4e65b53017fa87b61a24af5f16f2e571c47
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b37fc4e65b53017fa87b61a24af5f16f2e571c47

Author: Otavio Salvador <otavio at ossystems.com.br>
Date:   Fri Dec  9 16:27:06 2011 +0000

qconnman: fix order of qmake variable settings

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb |    3 +++
 meta-oe/recipes-qt/qconnman/qconnman.inc      |    5 ++---
 meta-oe/recipes-qt/qconnman/qconnman_git.bb   |    3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
index 4f7e891..87a3610 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
+++ b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
@@ -3,3 +3,6 @@ require qconnman.inc
 RCONFLICTS = "qconnman"
 
 inherit qt4e
+
+EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
+EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
diff --git a/meta-oe/recipes-qt/qconnman/qconnman.inc b/meta-oe/recipes-qt/qconnman/qconnman.inc
index ee27ae3..280a002 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman.inc
+++ b/meta-oe/recipes-qt/qconnman/qconnman.inc
@@ -4,10 +4,9 @@ DEPENDS = "connman"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-inherit autotools
+PR = "r1"
 
-EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
-EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
+inherit autotools
 
 PV = "0.0+gitr${SRCPV}"
 SRCREV = "9bab120f426e41552c369b7030414c792dd25a91"
diff --git a/meta-oe/recipes-qt/qconnman/qconnman_git.bb b/meta-oe/recipes-qt/qconnman/qconnman_git.bb
index fb14baa..9f03b90 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman_git.bb
+++ b/meta-oe/recipes-qt/qconnman/qconnman_git.bb
@@ -3,3 +3,6 @@ require qconnman.inc
 RCONFLICTS = "qconnman-e"
 
 inherit qt4x11
+
+EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
+EXTRA_OEMAKE += "INSTALL_ROOT=${D}"