[Android] Get the path to cross compilers correctly

[Rafaël Carré]

vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Tue Apr  2 14:24:46 2013 +0200| [55dcea580bf9ee387b022b3685b3b1d05afd5b4e] | committer: Rafaël Carré

Get the path to cross compilers correctly

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=55dcea580bf9ee387b022b3685b3b1d05afd5b4e
---

 compile.sh   |    2 +-
 configure.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compile.sh b/compile.sh
index 725217a..4a86445 100755
--- a/compile.sh
+++ b/compile.sh
@@ -74,7 +74,7 @@ export PLATFORM_SHORT_ARCH
 
 # Add the NDK toolchain to the PATH, needed both for contribs and for building
 # stub libraries
-NDK_TOOLCHAIN_PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`uname|tr A-Z a-z`-x86/bin
+NDK_TOOLCHAIN_PATH=`echo ${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin`
 export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
diff --git a/configure.sh b/configure.sh
index 5370daf..37ae8d2 100755
--- a/configure.sh
+++ b/configure.sh
@@ -30,7 +30,7 @@ CPPFLAGS="-I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/include -I${AN
 LDFLAGS="$LDFLAGS -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++${CXXSTL}/libs/${ANDROID_ABI}"
 
 SYSROOT=$ANDROID_NDK/platforms/$ANDROID_API/arch-$PLATFORM_SHORT_ARCH
-ANDROID_BIN=$ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`uname|tr A-Z a-z`-*/bin/
+ANDROID_BIN=`echo $ANDROID_NDK/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/\`uname|tr A-Z a-z\`-*/bin/`
 CROSS_COMPILE=${ANDROID_BIN}/${TARGET_TUPLE}-
 
 CPPFLAGS="$CPPFLAGS" \