configure: change default TIZEN_SDK_DEV_PATH for cross compiling

If CROSS_PREFIX is specified, we use "~/tizen-sdk-dev/$CROSS_PREFIX/"
as a default instead of "~/$CROSS_PREFIX-tizen-sdk-dev/".

Change-Id: I86e825ca2b1749be240e8850478de2c185b2cb8e
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/package/build.linux b/package/build.linux
index 6246c69926c5a8e43fbeaf21716ea1b2270ce745..52704c46ff8e65413bdac7da92b294fb2259b99a 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -14,7 +14,7 @@ prepare()
 
                # we should use cross compiler from mingw-x package
                export PATH=/opt/mingw32/bin:$PATH
-               export CROSS_PREFIX=i686-w64-mingw32-
+               export CROSS_PREFIX=i686-w64-mingw32
 
                # correct pc's prefix since windows install script is not run
                # on linux

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index 0edb7d9860d62bb77ca52ad22bd43738b8476492..cdd33abf48590f9a6537517dd19daa39fbc5d95f 100755 (executable)
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -79,7 +79,7 @@ if [ -z "$TIZEN_SDK_DEV_PATH" ] ; then
     if [ -z "$CROSS_PREFIX" ] ; then
         TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev
     else
-        TIZEN_SDK_DEV_PATH=${HOME}/${CROSS_PREFIX}tizen-sdk-dev
+        TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev/$CROSS_PREFIX
     fi
 fi
 
@@ -97,9 +97,9 @@ echo "$*"
 
 # avoid pkg-config bug on Windows
 if [ -z ${PKG_CONFIG_PATH} ] ; then
-export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig
+export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/lib/pkgconfig
 else
-export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig:${PKG_CONFIG_PATH}
+export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}
 fi
 
 # append common options
@@ -138,7 +138,7 @@ CONFIGURE_APPEND="
 ;;
 CROSS_MINGW*)
 CONFIGURE_APPEND="
- --cross-prefix=$CROSS_PREFIX
+ --cross-prefix=${CROSS_PREFIX}-
  --enable-werror
  --extra-ldflags=-static-libgcc
  --extra-ldflags=-static-libstdc++