From b37fc4e65b53017fa87b61a24af5f16f2e571c47 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 9 Dec 2011 16:27:06 +0000 Subject: qconnman: fix order of qmake variable settings Signed-off-by: Otavio Salvador Signed-off-by: Koen Kooi --- 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(-) (limited to 'meta-oe') diff --git a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb index 4f7e891f6..87a36108d 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 ee27ae38d..280a002c1 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 fb14baae9..9f03b90af 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}" -- cgit v1.2.3-54-g00ecf