[oe-commits] Mei Lei : lsb: Fix hard code libdir issue for multilib

[git version control]

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

Author: Mei Lei <lei.mei at intel.com>
Date:   Mon Aug  8 11:22:51 2011 +0800

lsb: Fix hard code libdir issue for multilib

Signed-off-by: Mei Lei <lei.mei at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-extended/lsb/lsb_1.4.bb |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index 2b38232..d472012 100644
--- a/meta/recipes-extended/lsb/lsb_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb_1.4.bb
@@ -21,7 +21,7 @@ S = ${WORKDIR}/lsb-release-${PV}
 do_install(){
 	oe_runmake install prefix=${D}  mandir=${D}/man/ DESTDIR=${D} 
 	mkdir -p ${D}/bin
-	mkdir -p ${D}/lib
+	mkdir -p ${D}/${baselib}
 	mkdir -p ${D}/etc/lsb-release.d
 	echo -n "LSB_VERSION=\"core-4.1-noarch:" > ${D}/etc/lsb-release
 	
@@ -61,34 +61,34 @@ do_install(){
 
 do_install_append(){
        install -d ${D}/etc/core-lsb
-       install -d ${D}/lib/lsb
+       install -d ${D}/${baselib}/lsb
        for i in lsb_killproc lsb_log_message lsb_pidofproc lsb_start_daemon
        do
            install -m 0755 ${WORKDIR}/${i} ${D}/etc/core-lsb
        done
-       install -m 0755 ${WORKDIR}/init-functions ${D}/lib/lsb
+       install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
        if [ "${TARGET_ARCH}" == "x86_64" ];then
 	       cd ${D}
-	       ln -sf lib lib64
-	       cd ${D}/lib
+	       ln -sf ${baselib} lib
+	       cd ${D}/${baselib}
                ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
                ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
        fi
        if [ "${TARGET_ARCH}" == "i586" ];then
-	       cd ${D}/lib
+	       cd ${D}/${baselib}
                ln -sf ld-linux.so.2 ld-lsb.so.2
                ln -sf ld-linux.so.2 ld-lsb.so.3
        fi
  
        if [ "${TARGET_ARCH}" == "powerpc64" ];then
   	       cd ${D}
-	       ln -sf lib lib64
-               cd ${D}/lib
+	       ln -sf ${baselib} lib
+               cd ${D}/${baselib}
                ln -sf ld64.so.1 ld-lsb-ppc64.so.2
                ln -sf ld64.so.1 ld-lsb-ppc64.so.3
        fi
        if [ "${TARGET_ARCH}" == "powerpc" ];then
-	       cd ${D}/lib
+	       cd ${D}/${baselib}
                ln -sf ld.so.1 ld-lsb-ppc32.so.2
                ln -sf ld.so.1 ld-lsb-ppc32.so.3
        fi