From 905a4222e7c9a502292d1f665985367ca6b15a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 17 Jan 2014 06:48:55 +0100
Subject: [PATCH] hawaii-shell: some tweaks to get starthawaii work out of the
 box
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* install starter scripts to bindir so they are found easily
* setup ADDITIONAL_PATH so the starter script finds qdbus
* rdepend bash & qdbus

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-hawaii/hawaii-shell/hawaii-shell_git.bb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb b/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
index b4014a49..619fbf30 100644
--- a/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
+++ b/recipes-hawaii/hawaii-shell/hawaii-shell_git.bb
@@ -21,10 +21,11 @@ PV = "0.2.0.2+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
-# make it find qtwaylandscanner / use our libexdir
+# make it find qtwaylandscanner / install starter scripts in bindir
 EXTRA_OECMAKE += " \
 	-DCMAKE_PROGRAM_PATH=${STAGING_DIR_NATIVE}/$bindir/qt5 \
-	-DCMAKE_INSTALL_LIBEXECDIR=${libexecdir} \
+	-DCMAKE_INSTALL_LIBEXECDIR=${bindir} \
+	-DADDITIONAL_PATH=${bindir}/${QT_DIR_NAME} \
 "
 
 FILES_${PN} += " \
@@ -38,3 +39,6 @@ FILES_${PN}-dbg += " \
 	${libdir}/hawaii/*/*/*/*/.debug \
 	${libdir}/weston/.debug \
 "
+
+# starter scripts rely on bash and qdbus
+RDEPENDS_${PN} = "bash qttools-tools"