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, 4 insertions, 4 deletions

diff --git a/meta/packages/glibc/glibc-initial.inc b/meta/packages/glibc/glibc-initial.inc
index 9355320b3a..288cb082a5 100644
--- a/meta/packages/glibc/glibc-initial.inc
+++ b/meta/packages/glibc/glibc-initial.inc
@@ -30,14 +30,14 @@ do_compile () {
 }
 
 do_stage () {
-        oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers
+        oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir='${layout_includedir}' prefix='${layout_prefix}' install-headers
 
         # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
         # so do them by hand.  We can tolerate an empty stubs.h for the moment.
         # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
-        mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu
-        touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h
-        cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h
+        mkdir -p ${STAGING_INCDIR}/gnu
+        touch ${STAGING_INCDIR}/gnu/stubs.h
+        cp ${S}/include/features.h ${STAGING_INCDIR}/features.h
 }
 
 do_install () {