3 files changed, 12 insertions, 12 deletions

diff --git a/meta/packages/glibc/glibc-initial_2.4.bb b/meta/packages/glibc/glibc-initial_2.4.bb
index ff458d3285..861478f7d5 100644
--- a/meta/packages/glibc/glibc-initial_2.4.bb
+++ b/meta/packages/glibc/glibc-initial_2.4.bb
@@ -32,14 +32,14 @@ do_compile () {
 }
 
 do_stage () {
-        oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+        oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include 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 ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-        touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-        cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+        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
 }
 
 do_install () {
diff --git a/meta/packages/glibc/glibc-initial_2.5.bb b/meta/packages/glibc/glibc-initial_2.5.bb
index fb05c9e029..0323debbdd 100644
--- a/meta/packages/glibc/glibc-initial_2.5.bb
+++ b/meta/packages/glibc/glibc-initial_2.5.bb
@@ -31,14 +31,14 @@ do_compile () {
 }
 
 do_stage () {
-        oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+        oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include 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 ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-        touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-        cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+        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
 }
 
 do_install () {
diff --git a/meta/packages/glibc/glibc-initial_csl-2005q3-2.bb b/meta/packages/glibc/glibc-initial_csl-2005q3-2.bb
index ff458d3285..6fe67083ec 100644
--- a/meta/packages/glibc/glibc-initial_csl-2005q3-2.bb
+++ b/meta/packages/glibc/glibc-initial_csl-2005q3-2.bb
@@ -32,14 +32,14 @@ do_compile () {
 }
 
 do_stage () {
-        oe_runmake cross-compiling=yes install_root=${CROSS_DIR}/${TARGET_SYS} prefix="" install-headers
+        oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include 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 ${CROSS_DIR}/${TARGET_SYS}/include/gnu
-        touch ${CROSS_DIR}/${TARGET_SYS}/include/gnu/stubs.h
-        cp ${S}/include/features.h ${CROSS_DIR}/${TARGET_SYS}/include/features.h
+        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
 }
 
 do_install () {