[oe-commits] org.oe.dev opie.bbclass: Install binaries to $bindir.

[pfalcon commit]

opie.bbclass: Install binaries to $bindir.
* Per #2254.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: ec958492985af5d5a65e0b22430c7b27ae784014
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ec958492985af5d5a65e0b22430c7b27ae784014
Files:
1
classes/opie.bbclass
Diffs:

#
# mt diff -rcab05a7ae4021fff2d1654a1e4e31f525dea6685 -rec958492985af5d5a65e0b22430c7b27ae784014
#
# 
# 
# patch "classes/opie.bbclass"
#  from [2653571d91e93ff5043997740e80656344ad35d8]
#    to [441638d80c7d1595e6037940f20b24b8bca48ebd]
# 
============================================================
--- classes/opie.bbclass	2653571d91e93ff5043997740e80656344ad35d8
+++ classes/opie.bbclass	441638d80c7d1595e6037940f20b24b8bca48ebd
@@ -80,6 +80,7 @@ python opie_do_opie_install() {
 	D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
 	WORKDIR = bb.data.getVar( "WORKDIR", d, True )
 	palmtopdir = bb.data.getVar( "palmtopdir", d, True )
+	gnubindir = bb.data.getVar( "bindir", d, True )
 	APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
 
 	if desktopdir is not None:
@@ -89,11 +90,12 @@ python opie_do_opie_install() {
 	os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) )
 
 	if APPTYPE == "binary":
-		os.system( "install -m 0755 %s/%s %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
+		os.system( "install -d %s%s/" % ( D, gnubindir ) )
+		os.system( "install -m 0755 %s/%s %s%s/" % ( S, APPNAME, D, gnubindir ) )
 	elif APPTYPE == "quicklaunch":
 		os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
-		os.system( "install -d %s%s/bin/" % ( D, palmtopdir ) )
-		os.system( "ln -sf %s/bin/quicklauncher %s%s/bin/%s" % ( palmtopdir, D, palmtopdir, APPNAME ) )
+		os.system( "install -d %s%s/" % ( D, gnubindir ) )
+		os.system( "ln -sf %s/quicklauncher %s%s/%s" % ( gnubindir, D, gnubindir, APPNAME ) )
 	elif APPTYPE == "plugin":
 		os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
 }