meta-sdk: Some more directory layout related fixes.

diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 29b7ecd..cc16344 100644 (file)
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -76,19 +76,19 @@ do_populate_sdk() {
         echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
         echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
        # remove unwanted housekeeping files
-       mv ${SDK_OUTPUT}${libdir}/../${TARGET_ARCH}-${TARGET_OS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+       mv ${SDK_OUTPUT}${libdir}/../${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
        rm -rf ${SDK_OUTPUT}${libdir}/ipkg
 
        # remove unwanted executables
        rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
 
        # remove broken .la files
-       rm ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/*.la
+       rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
 
        # fix pkgconfig data files
-       cd ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/pkgconfig
+       cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
        for f in *.pc ; do
-               sed -i 's%=/usr%=${prefix}/${TARGET_ARCH}-${TARGET_OS}%g' "$f"
+               sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
        done
        for f in *.pc ; do
                sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"