diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-07-05 16:21:53 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-07-05 16:21:53 +0000 |
| commit | 8d3f7b27e80ba08d2dc0e8167f01d27527697e06 (patch) | |
| tree | b1fa703042aa93dc9aaa90df0695211de7d9e807 /classes/opie.bbclass | |
| parent | b0dc3a8d1dc7e79b7960ee7503d80a7d43b8793f (diff) | |
| parent | 2ed2875b6c56be3a2f2b9db557e22024d3e92dd6 (diff) | |
merge of '6ecc6574ba0db38196a290448aaaf3706bcacee3'
and '7314baf01ff720449ddb034e256e260501df588f'
Diffstat (limited to 'classes/opie.bbclass')
| -rw-r--r-- | classes/opie.bbclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 916a8a4a30..c11cf0b4de 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -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 ) ) } |