[oe-commits] Christopher Larson : external-csl-toolchain: correct binary packaging

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 25d22bfb0970f7152b678796f2282dced7230fe1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=25d22bfb0970f7152b678796f2282dced7230fe1

Author: Christopher Larson <chris_larson at mentor.com>
Date:   Mon Feb  6 14:01:57 2012 -0600

external-csl-toolchain: correct binary packaging

CS puts optimized executables in usr/lib/bin, not usr/bin.

Signed-off-by: Christopher Larson <chris_larson at mentor.com>

---

 meta/recipes-core/meta/external-csl-toolchain.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/meta/external-csl-toolchain.bb b/meta/recipes-core/meta/external-csl-toolchain.bb
index 7dd8da2..fc35acb 100644
--- a/meta/recipes-core/meta/external-csl-toolchain.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain.bb
@@ -58,7 +58,12 @@ do_install() {
 
 	rm ${D}${sysconfdir}/rpc
 	rm -r ${D}${datadir}/zoneinfo
-	rm -r ${D}${libdir}/bin
+
+	mv ${D}${libdir}/bin/* ${D}${bindir}/
+	if [ -e ${D}${libdir}/bin/.debug ]; then
+		install -d ${D}${bindir}/.debug
+		mv ${D}${libdir}/bin/.debug/* ${D}${bindir}/.debug/
+	fi
 
 	sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libc.so
 	sed -i -e "s# /lib# ../../lib#g" -e "s# /usr/lib# .#g" ${D}${libdir}/libpthread.so