meta-toolchain: Fix up various paths and file locations to be more consistent

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

1 files changed, 6 insertions, 3 deletions

diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 9f2520d2a5..9deda4c1c0 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -39,8 +39,11 @@ do_populate_sdk() {
         mv ${SDK_OUTPUT}/usr/lib/opkg/* ${SDK_OUTPUT}/${prefix}/usr/lib/opkg/
         rm -Rf ${SDK_OUTPUT}/usr/lib
 
+        install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}
+        install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/${layout_sysconfdir}/
+
         install -d ${SDK_OUTPUT}/${sysconfdir}
-        install -m 0644 ${IPKGCONF_TARGET} ${IPKGCONF_SDK} ${SDK_OUTPUT}/${sysconfdir}
+        install -m 0644 ${IPKGCONF_SDK} ${SDK_OUTPUT}/${sysconfdir}/
 
         # extract and store ipks, pkgdata and shlibs data
         target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '`
@@ -89,10 +92,10 @@ do_populate_sdk() {
         touch $script
         echo 'export PATH=${prefix}/bin:$PATH' >> $script
         echo 'export PKG_CONFIG_SYSROOT_DIR=${prefix}/${TARGET_SYS}' >> $script
-        echo 'export PKG_CONFIG_PATH=${prefix}/${TARGET_SYS}/${layout_libdir}/pkgconfig' >> $script
+        echo 'export PKG_CONFIG_PATH=${prefix}/${TARGET_SYS}${layout_libdir}/pkgconfig' >> $script
         echo 'export CONFIG_SITE=${prefix}/site-config' >> $script
         echo "alias opkg='LD_LIBRARY_PATH=${prefix}/lib ${prefix}/bin/opkg-cl -f ${sysconfdir}/opkg-sdk.conf -o ${prefix}'" >> $script
-        echo "alias opkg-target='LD_LIBRARY_PATH=${prefix}/lib ${prefix}/bin/opkg-cl -f ${sysconfdir}/opkg.conf -o ${prefix}/${TARGET_SYS}'" >> $script
+        echo "alias opkg-target='LD_LIBRARY_PATH=${prefix}/lib ${prefix}/bin/opkg-cl -f ${prefix}/${TARGET_SYS}${layout_sysconfdir}/opkg.conf -o ${prefix}/${TARGET_SYS}'" >> $script
 
         # Add version information
         versionfile=${SDK_OUTPUT}/${prefix}/version