meta-toolchain.bb: remove hardcoded references

diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 8b303f3..45ce852 100644 (file)
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -72,22 +72,22 @@ EOF
         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}/../arm-linux/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}/arm-linux/lib/*.la
+       rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
 
        # fix pkgconfig data files
-       cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig
+       cd ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/pkgconfig
        for f in *.pc ; do
-               sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
+               sed -i 's%=/usr%=${prefix}/${TARGET_SYS}%g' "$f"
        done
        for f in *.pc ; do
-               sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f"
+               sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
        done
 
         mkdir -p ${SDK_DEPLOY}