From d903b9785a38bb2207971af8084f84d091bea5cd Mon Sep 17 00:00:00 2001
From: Humdinger <humdingerb@gmail.com>
Date: Fri, 17 Oct 2014 19:58:09 +0200
Subject: [PATCH] Improved QuickLaunch recipe

* Improved BUILD() and INSTALL() to not be needlessly complicated.
* Point SRC_URI to latest commit that fixes some HTML issues in
the QuickLaunch Readme.
---
 haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe b/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe
index ee508a704..65eadf731 100644
--- a/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe
+++ b/haiku-apps/quicklaunch/quicklaunch-0.9.7.recipe
@@ -7,10 +7,10 @@ them in a list. You choose an app from that list with the CursorUp/Down keys \
 and launch it by hitting Return. Escape quits QuickLaunch.
 "
 HOMEPAGE="http://sourceforge.net/projects/quicklaunch-h/" 
-SRC_URI="git://git.code.sf.net/p/quicklaunch-h/code#b5ac88efe23cc04c17d566d992703c50c9eb8639"
+SRC_URI="git://git.code.sf.net/p/quicklaunch-h/code#4b403dc170130471f82660ceeb16ca78399bd143"
 LICENSE="MIT"
 COPYRIGHT="2014 Humdinger"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
@@ -18,10 +18,10 @@ PROVIDES="
 	app:quicklaunch = $portVersion
 	"
 REQUIRES="
-	haiku >= r1~alpha4_pm_hrev46536-1
+	haiku >= $haikuVersion
 	"
 BUILD_REQUIRES="
-	haiku_devel >= r1~alpha4_pm_hrev46536-1
+	haiku_devel >= $haikuVersion
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -34,7 +34,7 @@ USER_SETTINGS_FILES="settings/QuickLaunch_settings"
 
 BUILD()
 {
-	make $jobArgs
+	make $jobArgs OBJ_DIR=objects
 }
 
 INSTALL()
@@ -42,8 +42,7 @@ INSTALL()
 	quicklaunchDir=$appsDir/QuickLaunch
 	mkdir -p $quicklaunchDir
 
-	ARCH=$(echo $buildArchitecture | sed 's/_/-/g')	
-	cp -af objects.$ARCH-release/QuickLaunch $quicklaunchDir
+	cp -af objects/QuickLaunch $quicklaunchDir
 	cp -af ReadMe.html $quicklaunchDir
 	cp -r images $quicklaunchDir