From: Denys Dmytriyenko <[email protected]>

Last change broke Qt5 install, which uses B!=S unlike Qt4.

Signed-off-by: Denys Dmytriyenko <[email protected]>
---
 meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb 
b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
index d0a9f7a..1b15f2f 100644
--- a/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
+++ b/meta-arago-extras/recipes-qt/qt-apps/qt-tstat_2.0.bb
@@ -12,7 +12,7 @@ require recipes-core/matrix/matrix-gui-paths.inc
 
 inherit qt-provider
 
-PR = "r7"
+PR = "r8"
 
 DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}"
 
@@ -28,13 +28,11 @@ SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', 
'file://0002-Replace-QtGui
 
 S = "${WORKDIR}/git/"
 
-BUILDDIR ?= "."
-
 do_install() {
        install -d ${D}/usr/bin
-       install -m 0755 ${BUILDDIR}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
+       install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo
        install -d ${D}${MATRIX_APP_DIR}/qt_tstat
-       cp -rf matrix-files/*  ${D}${MATRIX_APP_DIR}/qt_tstat
+       cp -rf ${S}/matrix-files/*  ${D}${MATRIX_APP_DIR}/qt_tstat
 }
 
 PACKAGES += "matrix-gui-thermostat-demo"
-- 
1.9.2

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to