From 283ffcea85901ac5dc28010b0e9b5d83cc394059 Mon Sep 17 00:00:00 2001
From: Rom Walton <romw@romwnet.org>
Date: Wed, 16 Jan 2013 13:39:58 -0500
Subject: [PATCH] android: more bug fixes

---
 android/build_androidtc.sh | 10 +++-------
 android/build_boinc.sh     |  2 +-
 android/build_curl.sh      |  2 +-
 android/build_openssl.sh   |  2 +-
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/android/build_androidtc.sh b/android/build_androidtc.sh
index 4dbdd6c530..35d66bf669 100644
--- a/android/build_androidtc.sh
+++ b/android/build_androidtc.sh
@@ -1,12 +1,8 @@
 #/bin/sh
 #script to setup Android toolchain
 
-export ANDROIDTC="~/android-tc"
-
-if [ ! -d "$ANDROIDTC" ]; then
-
-    cd ~/NVPACK/android-ndk-r8
-    build/tools/make-standalone-toolchain.sh --platform=android-4 --install-dir=$ANDROIDTC
-    cd ~
+export ANDROIDTC="$HOME/android-tc"
 
+if [ ! -d $ANDROIDTC ]; then
+    $NDKROOT/build/tools/make-standalone-toolchain.sh --platform=android-4 --install-dir=$ANDROIDTC
 fi
diff --git a/android/build_boinc.sh b/android/build_boinc.sh
index 89b22fd2b5..b61cd3a4f6 100644
--- a/android/build_boinc.sh
+++ b/android/build_boinc.sh
@@ -10,7 +10,7 @@ export OPENSSL_DIR=$BOINC/../boinc_depends_android_eclipse/openssl
 export CURL_DIR=$BOINC/../boinc_depends_android_eclipse/curl
 export PKG_CONFIG_DEBUG_SPEW=1
 
-export ANDROIDTC="~/android-tc"
+export ANDROIDTC="$HOME/android-tc"
 export TCBINARIES="$ANDROIDTC/bin"
 export TCINCLUDES="$ANDROIDTC/arm-linux-androideabi"
 export TCSYSROOT="$ANDROIDTC/sysroot"
diff --git a/android/build_curl.sh b/android/build_curl.sh
index f1be897013..8ba0e1265b 100644
--- a/android/build_curl.sh
+++ b/android/build_curl.sh
@@ -7,7 +7,7 @@ MAKECLEAN="yes"
 
 CURL="/home/boincadm/src/curl-7.28.1" #CURL sources, required by BOINC
 
-export ANDROIDTC="~/android-tc"
+export ANDROIDTC="$HOME/android-tc"
 export TCBINARIES="$ANDROIDTC/bin"
 export TCINCLUDES="$ANDROIDTC/arm-linux-androideabi"
 export TCSYSROOT="$ANDROIDTC/sysroot"
diff --git a/android/build_openssl.sh b/android/build_openssl.sh
index 9bcbed8303..44c1106334 100644
--- a/android/build_openssl.sh
+++ b/android/build_openssl.sh
@@ -7,7 +7,7 @@ MAKECLEAN="yes"
 
 OPENSSL="/home/boincadm/src/openssl-1.0.1c" #openSSL sources, requiered by BOINC
 
-export ANDROIDTC="~/android-tc"
+export ANDROIDTC="$HOME/android-tc"
 export TCBINARIES="$ANDROIDTC/bin"
 export TCINCLUDES="$ANDROIDTC/arm-linux-androideabi"
 export TCSYSROOT="$ANDROIDTC/sysroot"