Index: /issm/trunk-jpl/externalpackages/android/android-sdk/install.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/android/android-sdk/install.sh	(revision 14319)
+++ /issm/trunk-jpl/externalpackages/android/android-sdk/install.sh	(revision 14320)
@@ -19,5 +19,5 @@
 
 	# Cleanup the install
-	rm -rf install-sdk
+	rm -rf install
 
 	# Download from ISSM server
@@ -28,5 +28,5 @@
 
 	# Move to install
-	mv -f android-sdk-macosx install-sdk
+	mv -f android-sdk-macosx install
 
 	# Post_install configuration: 
@@ -39,5 +39,5 @@
 	# Note: API 16, API 15 and 14 correspond to Android 4.1, 4.0.3 and 4.0 respectively. 
 
-	cd install-sdk/tools/ && source ./android update sdk -t platform-tool,${api_levels},system-image --no-ui
+	cd install/tools/ && source ./android update sdk -t platform-tool,${api_levels},system-image --no-ui
 
 fi
@@ -50,5 +50,5 @@
 
 	# Here we delete the Android-4.0.3 device if it already exists.
-	cd $present_dir/install-sdk/tools
+	cd $present_dir/install/tools
 
     if [ -e $ANDROID_DIR/android-emulators/$default_droid ] 
@@ -71,5 +71,5 @@
     # a terminal in our device.
 
-	cd $present_dir/install-sdk/tools
+	cd $present_dir/install/tools
 	./emulator -avd $default_droid -sdcard $ANDROID_DIR/android-emulators/$sd_card.img &
 
@@ -79,4 +79,4 @@
 
 if [[ $step == "4" || $step == "0" ]]; then
-	rm -rf install-sdk
+	rm -rf install
 fi
Index: /issm/trunk-jpl/externalpackages/gsl/install-android.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gsl/install-android.sh	(revision 14319)
+++ /issm/trunk-jpl/externalpackages/gsl/install-android.sh	(revision 14320)
@@ -25,6 +25,5 @@
     cd src
 
-    mv ./../Makefile.am.patch ./
-    patch Makefile.am < Makefile.am.patch
+    patch Makefile.am < ./../:wqMakefile.am.patch
 
     autoreconf -i