cross-linkage: Add improvements from OE

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

1 files changed, 9 insertions, 3 deletions

diff --git a/meta/packages/meta/cross-linkage_1.0.bb b/meta/packages/meta/cross-linkage_1.0.bb
index a2da649acc..9be09aa6f8 100644
--- a/meta/packages/meta/cross-linkage_1.0.bb
+++ b/meta/packages/meta/cross-linkage_1.0.bb
@@ -3,8 +3,8 @@ SECTION = "devel"
 PACKAGES = ""
 
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r0"
 EXCLUDE_FROM_WORLD = "1"
+PR = "r0"
 
 SRC_URI = ""
 
@@ -22,8 +22,14 @@ do_install() {
 
 do_stage () {
         install -d ${CROSS_DIR}/${TARGET_SYS}/
-        rm -rf ${CROSS_DIR}/${TARGET_SYS}/include
+        if [ -e ${CROSS_DIR}/${TARGET_SYS}/include ]; then
+                cp -pPRr ${CROSS_DIR}/${TARGET_SYS}/include/* ${STAGING_INCDIR}
+                mv ${CROSS_DIR}/${TARGET_SYS}/include/ ${CROSS_DIR}/${TARGET_SYS}/include-oldbackup
+        fi
         ln -s  ${STAGING_INCDIR}/ ${CROSS_DIR}/${TARGET_SYS}/include
-        rm -rf ${CROSS_DIR}/${TARGET_SYS}/lib
+        if [ -e ${CROSS_DIR}/${TARGET_SYS}/lib ]; then
+                cp -pPRr ${CROSS_DIR}/${TARGET_SYS}/lib/* ${STAGING_LIBDIR}
+                mv ${CROSS_DIR}/${TARGET_SYS}/lib/ ${CROSS_DIR}/${TARGET_SYS}/lib-oldbackup
+        fi
         ln -s  ${STAGING_LIBDIR} ${CROSS_DIR}/${TARGET_SYS}/lib 
 }