fix 2 bugs in android runshell

Makefile

@@ -165,7 +165,5 @@ android:
 androidapp:
 	$(MAKE) android
 	$(MAKE) -C standalone/android
-	mkdir -p tmp
-	cp standalone/android/source/term/bin/Term-debug.apk tmp/git-annex.apk
 
 .PHONY: git-annex tags

git-annex.cabal

@@ -8,7 +8,7 @@ Stability: Stable
 Copyright: 2010-2013 Joey Hess
 License-File: COPYRIGHT
 Homepage: http://git-annex.branchable.com/
-Build-type: Simple
+Build-type: Custom
 Category: Utility
 Synopsis: manage files with git, without checking their contents into git
 Description:

standalone/android/Makefile

@@ -76,6 +76,8 @@ build: start
 	git rev-parse HEAD > $(GIT_ANNEX_ANDROID_SOURCETREE)/term/libs/armeabi/lib.version.so
 
 	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/term && ant debug
+	mkdir -p ../../tmp
+	cp $(GIT_ANNEX_ANDROID_SOURCETREE)/term/bin/Term-debug.apk ../../tmp/git-annex.apk
 
 $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl:
 	cd $(GIT_ANNEX_ANDROID_SOURCETREE)/openssl && CC=$$(which cc) ./Configure android

standalone/android/runshell

@@ -54,7 +54,7 @@ buildtree () {
 }
 
 install () {
-	if $cmd test ! -e "$base/git-annex"; then
+	if $cmd test ! -e "$base/bin/git-annex"; then
 		if ! $cmd mkdir -p "$HOME"; then
 			$cmd echo "mkdir of $HOME failed!"
 		fi
@@ -100,7 +100,7 @@ run () {
 		shift 1
 		exec "$cmd" "$@"
 	else
-		if $cmd test -e "$HOME/.config/git-annex/autostart; then
+		if $cmd test -e "$HOME/.config/git-annex/autostart"; then
 			git annex assistant --autostart || $cmd true
 		fi
 		/system/bin/sh