glibc: Convert from hardcoded staging layout

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3027 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 7 insertions, 7 deletions

diff --git a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
index a7bf9b9582..e2a2119f2e 100644
--- a/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
+++ b/meta/packages/glibc/glibc_2.3.5+cvs20050627.bb
@@ -120,10 +120,10 @@ do_compile () {
 }
 
 do_stage() {
-        rm -f ${STAGING_LIBDIR}/libc.so.6
-        oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
-                   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
-                   '${STAGING_LIBDIR}/libc.so.6' \
+        rm -f ${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6
+        oe_runmake 'install_root=${STAGING_DIR_HOST}' \
+                   'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \
+                   '${STAGING_DIR_HOST}${layout_base_libdir}/libc.so.6' \
                    install-headers install-lib
 
         install -d ${STAGING_INCDIR}/gnu \
@@ -137,10 +137,10 @@ do_stage() {
                 install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
         done
         for i in libc.a libc_pic.a libc_nonshared.a; do
-                install -m 0644 ${B}/$i ${STAGING_LIBDIR}/ || die "failed to install $i"
+                install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
         done
-        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_LIBDIR}/libpthread.so
-        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_LIBDIR}/libc.so
+        echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
+        echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
 }
 
 require glibc-package.bbclass