Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 12990)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 12991)
@@ -92,7 +92,7 @@
 
 #VALGRIND
-VALGRIND_DIR="$ISSM_DIR/externalpackages/valgrind/install/bin"
+VALGRIND_DIR="$ISSM_DIR/externalpackages/valgrind/install"
 if [ -d "$VALGRIND_DIR" ]; then
-	export PATH="$VALGRIND_DIR:$PATH"
+	export PATH="$VALGRIND_DIR/bin:$PATH"
 fi
 
@@ -195,7 +195,6 @@
 
 #APPSCAN
-APPSCAN_DIR="$ISSM_DIR/externalpackages/appscan"
+APPSCAN_DIR="$ISSM_DIR/externalpackages/appscan/install"
 if [ -d "$APPSCAN_DIR" ]; then
-	export PATH="$PATH:$APPSCAN_DIR/install/bin"
 	export PATH="$PATH:$APPSCAN_DIR/bin"
 fi
@@ -238,14 +237,7 @@
 
 #ANDROID_NDK:
-ANDROID_DIR="$ISSM_DIR/externalpackages/android"
-if [ -d "$ANDROID_DIR" ]; then
-	export ANDROID_NDK_DIR
+ANDROID_NDK_DIR="$ISSM_DIR/externalpackages/android-ndk/install"
+if [ -d "$ANDROID_NDK_DIR" ]; then
 	export PATH="$PATH:$ANDROID_NDK_DIR/"
-fi
-
-#ANDROID_DIR
-ANDROID_NDK_DIR="$ANDROID_DIR/android-ndk/install"
-if [ -d "$ANDROID_NDK_DIR" ]; then
-	export ANDROID_DIR
 fi
 
@@ -280,5 +272,5 @@
 
 #MODELE
-MODELE_DIR="$ISSM_DIR/externalpackages/modelE"
+MODELE_DIR="$ISSM_DIR/externalpackages/modelE/install"
 if [ -d "$MODELE_DIR" ]; then
 	export PATH="$MODELE_DIR/src/exec:$PATH"
@@ -286,13 +278,13 @@
 
 #GIT
-GIT_DIR="$ISSM_DIR/externalpackages/git"
+GIT_DIR="$ISSM_DIR/externalpackages/git/install"
 if [ -d "$GIT_DIR" ]; then
-	export PATH="$PATH:$GIT_DIR/install/bin"
+	export PATH="$PATH:$GIT_DIR/bin"
 fi
 
 #NCVIEW
-NCVIEW_DIR="$ISSM_DIR/externalpackages/ncview"
+NCVIEW_DIR="$ISSM_DIR/externalpackages/ncview/install"
 if [ -d "$NCVIEW_DIR" ]; then
-	export PATH="$PATH:$NCVIEW_DIR/install"
+	export PATH="$PATH:$NCVIEW_DIR"
 fi
 
@@ -305,7 +297,7 @@
 
 #ASPELL
-ASPELL_DIR="$ISSM_DIR/externalpackages/aspell/"
+ASPELL_DIR="$ISSM_DIR/externalpackages/aspell/install"
 if [ -d "$ASPELL_DIR" ]; then
-	export PATH="$ASPELL_DIR/install/bin:$PATH"
+	export PATH="$ASPELL_DIR/bin:$PATH"
 fi
 
@@ -313,5 +305,4 @@
 ESMF_DIR="$ISSM_DIR/externalpackages/esmf/esmf"
 if [ -d "$ESMF_DIR" ]; then
-	export ESMF_DIR=$ISSM_DIR/externalpackages/esmf/esmf
 	export ESMF_COMPILER=gfortran
 	export ESMF_COMM=mpich2
@@ -319,5 +310,5 @@
 
 #HDF5
-HDF5_DIR=$ISSM_DIR/externalpackages/hdf5/install
+HDF5_DIR="$ISSM_DIR/externalpackages/hdf5/install"
 if [ -d "$HDF5_DIR" ]; then
 	export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:$HDF5_DIR/lib"
@@ -328,5 +319,5 @@
 
 #SVN
-SVN_DIR=$ISSM_DIR/externalpackages/svn/install
+SVN_DIR="$ISSM_DIR/externalpackages/svn/install"
 if [ -d "$SVN_DIR" ]; then
 	export PATH="$SVN_DIR/bin:$PATH"
@@ -336,5 +327,5 @@
 
 #APR
-APR_DIR=$ISSM_DIR/externalpackages/apr/install
+APR_DIR="$ISSM_DIR/externalpackages/apr/install"
 if [ -d "$APR_DIR" ]; then
 	export PATH="$APR_DIR/bin:$PATH"
@@ -344,5 +335,5 @@
 
 #APR_UTIL
-APR_UTIL_DIR=$ISSM_DIR/externalpackages/apr-util/install
+APR_UTIL_DIR="$ISSM_DIR/externalpackages/apr-util/install"
 if [ -d "$APR_UTIL_DIR" ]; then
 	export PATH="$APR_UTIL_DIR/bin:$PATH"
@@ -352,5 +343,5 @@
 
 #SQLITE
-SQLITE_DIR=$ISSM_DIR/externalpackages/sqlite/install
+SQLITE_DIR="$ISSM_DIR/externalpackages/sqlite/install"
 if [ -d "$SQLITE_DIR" ]; then
 	export PATH="$SQLITE_DIR/bin:$PATH"
@@ -358,4 +349,2 @@
 	export LIBRARY_PATH="$LIBRARY_PATH:$SQLITE_DIR/lib"
 fi
-
-