Merge remote-tracking branch 'upstream/master'

Ryan Northey · Ryan Northey · commit 14c953516695 · 2012-03-14T17:12:13.000Z
diff --git a/distribute.sh b/distribute.sh
@@ -188,7 +188,7 @@ function run_prepare() {
 		exit -1
 	fi
 	if [ ! -d "$ANDROIDNDK" ]; then
-		echo "ANDROIDNDK=$ANDROIDSDK"
+		echo "ANDROIDNDK=$ANDROIDNDK"
 		error "ANDROIDNDK path is invalid, it must be a directory. abort."
 		exit 1
 	fi
diff --git a/docs/source/prerequisites.rst b/docs/source/prerequisites.rst
@@ -49,5 +49,5 @@ After installing them, export both installation path, NDK version and API to use
 
 Also, you must configure you're PATH to add the ``android`` binary::
 
-    export PATH=/path/to/android-sdk-linux/tools:$PATH
+    export PATH=/path/to/android-ndk:/path/to/android-sdk-linux/tools:$PATH
 

Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,5 @@ After installing them, export both installation path, NDK version and API to use`
`49`	`49`
`50`	`50`	Also, you must configure you're PATH to add the ``android`` binary::
`51`	`51`
`52`		`- export PATH=/path/to/android-sdk-linux/tools:$PATH`
	`52`	`+ export PATH=/path/to/android-ndk:/path/to/android-sdk-linux/tools:$PATH`
`53`	`53`