Merge "Add --start, --launch=<name> and --launch-list options to ndk-gdb." into froyo

[android-x86/ndk.git] / ndk-build

diff --git a/ndk-build b/ndk-build
index 4afb82a..05bc8f8 100755 (executable)
--- a/ndk-build
+++ b/ndk-build
@@ -29,7 +29,16 @@
 #
 #  This really is a tiny wrapper around GNU Make.
 #
+
+# Ensure we get the full path of this script's directory
+# this is needed if the caller uses the -C <path> GNU Make
+# option, as in:
+#
+#    cd ndk
+#    ./ndk-build -C <project-path>
+#
 PROGDIR=`dirname $0`
+PROGDIR=`cd $PROGDIR && pwd`
 
 # if GNUMAKE is not defined in the environment, use 'make'
 if [ -z "$GNUMAKE" ] ; then