[oe-commits] : cross bbclass: sync with poky

[OE GIT Trial]

Module: OE.dev
Branch: org.openembedded.dev
Commit: 118c1db277199e0daa2805260d83e368ecdbba3f
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=118c1db277199e0daa2805260d83e368ecdbba3f

Author:  <koen at openembedded.org>
Date:   Wed Oct  1 12:09:10 2008 +0000

cross bbclass: sync with poky

---

 classes/cross.bbclass |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index a35f4df..9dddca1 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -3,8 +3,11 @@
 EXCLUDE_FROM_WORLD = "1"
 
 # Save PACKAGE_ARCH before changing HOST_ARCH
-OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
-PACKAGE_ARCH = ${OLD_PACKAGE_ARCH}
+OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}"
+# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
+OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
+BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
 
 PACKAGES = ""
 
@@ -49,8 +52,8 @@ bindir = "${exec_prefix}/bin"
 sbindir = "${exec_prefix}/bin"
 libexecdir = "${exec_prefix}/libexec"
 libdir = "${exec_prefix}/lib"
-includedir = "${STAGING_DIR_TARGET}/${layout_includedir}"
-oldincludedir = "${STAGING_DIR_TARGET}/${layout_includedir}"
+includedir = "${exec_prefix}/include"
+oldincludedir = "${exec_prefix}/include"
 
 do_stage () {
 	oe_runmake install