From: Uwe Hermann <redacted>
Date: Fri, 27 Dec 2013 01:50:43 +0000 (+0100)
Subject: sigrok-cross-android: Drop $TOP usage for now.
X-Git-Url: https://sigrok.org/gitweb/?a=commitdiff_plain;h=c09c85b3dc21276af851a5cb78008e717f631dec;hp=b5f5503403d21d170f7a3cae40f3a7e3646951b2;p=sigrok-util.git

sigrok-cross-android: Drop $TOP usage for now.

This breaks in some cases, e.g.

./sigrok-cross-android: line 201:
[...]/sr_android_build/./libusb-1.0.patch: No such file or directory
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 1cbac7b..829906b 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -78,12 +78,6 @@ export -n PKG_CONFIG_PATH
 # Define some helper variables.
 C="--host=arm-linux-androideabi --prefix=$PREFIX"
 
-# Remember the directory we're in.
-case "$0" in
-  /*) TOP=$(dirname "$0");;
-  *) TOP=$(dirname "$(pwd)"/"$0");;
-esac
-
 # Get the latest versions of config.guess/config.sub that know about Android.
 git clone git://git.savannah.gnu.org/config.git
 
@@ -198,7 +192,7 @@ cd ..
 wget http://$SF_MIRROR/project/libusb/libusb-1.0/libusb-$VER_LIBUSB_1_0/libusb-$VER_LIBUSB_1_0.tar.bz2
 tar xfj libusb-$VER_LIBUSB_1_0.tar.bz2
 cd libusb-$VER_LIBUSB_1_0
-patch -p1 < $TOP/libusb-1.0.patch
+patch -p1 < ../../libusb-1.0.patch
 ./configure $C
 make
 make install