Index: /issm/trunk-jpl/etc/environment.csh
===================================================================
--- /issm/trunk-jpl/etc/environment.csh	(revision 25846)
+++ /issm/trunk-jpl/etc/environment.csh	(revision 25847)
@@ -4,6 +4,8 @@
 setenv PATH {$PATH}:{$ISSM_DIR}/scripts
 
+ISSM_EXT_DIR="{$ISSM_DIR}/externalpackages" # Redefine this constant if externalpackages are installed to a different directory
+
 #MPI
-set MPI_DIR="$ISSM_DIR/externalpackages/mpich/install"
+set MPI_DIR="{$ISSM_EXT_DIR}/mpich/install"
 if (-d $MPI_DIR) then
 	setenv MPI_DIR {$MPI_DIR}
@@ -14,5 +16,5 @@
 
 #PETSC
-set PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"
+set PETSC_DIR="{$ISSM_EXT_DIR}/petsc/install"
 if (-d $PETSC_DIR) then
 	setenv PETSC_DIR {$PETSC_DIR}
@@ -20,5 +22,5 @@
 endif
 
-set SCOTCH_DIR="$ISSM_DIR/externalpackages/scotch/install"
+set SCOTCH_DIR="{$ISSM_EXT_DIR}/scotch/install"
 if (-d $SCOTCH_DIR) then
 	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$SCOTCH_DIR/lib
@@ -26,5 +28,5 @@
 
 #SLEPC
-set SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
+set SLEPC_DIR="{$ISSM_EXT_DIR}/slepc/install"
 if (-d $SLEPC_DIR) then
 	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$SLEPC_DIR/lib
@@ -32,5 +34,5 @@
 
 #PETSC
-set TAO_DIR="$ISSM_DIR/externalpackages/tao/install"
+set TAO_DIR="{$ISSM_EXT_DIR}/tao/install"
 if (-d $TAO_DIR) then
 	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$TAO_DIR/lib
@@ -38,5 +40,5 @@
 
 #Dakota
-set DAKOTA_DIR="$ISSM_DIR/externalpackages/dakota/install"
+set DAKOTA_DIR="{$ISSM_EXT_DIR}/dakota/install"
 if (-d $DAKOTA_DIR) then
 	setenv PATH {$DAKOTA_DIR}/bin:{$PATH}
@@ -46,6 +48,6 @@
 
 #Boost
-set BOOST_DIR="$ISSM_DIR/externalpackages/boost/install"
-set BOOSTROOT="$ISSM_DIR/externalpackages/boost/install"
+set BOOST_DIR="{$ISSM_EXT_DIR}/boost/install"
+set BOOSTROOT="{$ISSM_EXT_DIR}/boost/install"
 if (-d $BOOST_DIR) then
    setenv PATH {$BOOST_DIR}/bin:{$PATH}
@@ -54,5 +56,5 @@
 
 #Doxygen
-set DOXYGEN_DIR="$ISSM_DIR/externalpackages/doxygen/install"
+set DOXYGEN_DIR="{$ISSM_EXT_DIR}/doxygen/install"
 if (-d $DOXYGEN_DIR) then
 	setenv MANPATH {$MANPATH}:{$DOXYGEN_DIR}/man
@@ -61,5 +63,5 @@
 
 #AUTOTOOLS
-set AUTOTOOLS_DIR="$ISSM_DIR/externalpackages/autotools/install"
+set AUTOTOOLS_DIR="{$ISSM_EXT_DIR}/autotools/install"
 if (-d $AUTOTOOLS_DIR) then
 	setenv PATH {$AUTOTOOLS_DIR}/bin:{$PATH}
@@ -67,5 +69,5 @@
 
 #SSH
-set SSH_DIR="$ISSM_DIR/externalpackages/ssh"
+set SSH_DIR="{$ISSM_EXT_DIR}/ssh"
 if (-d $SSH_DIR) then
 	setenv PATH {$PATH}:{$SSH_DIR}
@@ -73,5 +75,5 @@
 
 #VALGRIND
-set VALGRIND_DIR="$ISSM_DIR/externalpackages/valgrind/install/bin"
+set VALGRIND_DIR="{$ISSM_EXT_DIR}/valgrind/install/bin"
 if (-d $VALGRIND_DIR) then
 	setenv PATH {$PATH}:{$VALGRIND_DIR}
@@ -79,5 +81,5 @@
 
 #MERCURIAL
-set MERCURIAL_DIR="$ISSM_DIR/externalpackages/mercurial/install"
+set MERCURIAL_DIR="{$ISSM_EXT_DIR}/mercurial/install"
 if (-d $MERCURIAL_DIR) then
 	setenv PYTHONPATH {$MERCURIAL_DIR}/mercurial/pure/
@@ -86,5 +88,5 @@
 
 #GSL
-set GSL_DIR="$ISSM_DIR/externalpackages/gsl/install"
+set GSL_DIR="{$ISSM_EXT_DIR}/gsl/install"
 if (-d $GSL_DIR) then
 	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$GSL_DIR}/lib
@@ -92,5 +94,5 @@
 
 #CMAKE
-set CMAKE_DIR="$ISSM_DIR/externalpackages/cmake/install"
+set CMAKE_DIR="{$ISSM_EXT_DIR}/cmake/install"
 if (-d $CMAKE_DIR) then
 	setenv PATH {$CMAKE_DIR}/bin:{$PATH}
@@ -98,5 +100,5 @@
 
 #YAMS
-set YAMS_DIR="$ISSM_DIR/externalpackages/yams/install"
+set YAMS_DIR="{$ISSM_EXT_DIR}/yams/install"
 if (-d $YAMS_DIR) then
 	setenv PATH {$PATH}:{$YAMS_DIR}/bin
@@ -104,5 +106,5 @@
 
 #SHELL2JUNIT
-set SHELL2JUNIT_DIR="$ISSM_DIR/externalpackages/shell2junit"
+set SHELL2JUNIT_DIR="{$ISSM_EXT_DIR}/shell2junit"
 if (-d $SHELL2JUNIT_DIR) then
 	setenv PATH {$SHELL2JUNIT_DIR}/install:{$PATH}
@@ -110,5 +112,5 @@
 
 #GMT
-set GMT_DIR="$ISSM_DIR/externalpackages/gmt"
+set GMT_DIR="{$ISSM_EXT_DIR}/gmt"
 if (-d $GMT_DIR) then
 	setenv PATH {$GMT_DIR}/install/bin/:{$PATH}
Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 25846)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 25847)
@@ -173,5 +173,7 @@
 path_append "${ISSM_DIR}/scripts"
 
-SVN_DIR="${ISSM_DIR}/externalpackages/svn/install"
+ISSM_EXT_DIR="${ISSM_DIR}/externalpackages" # Redefine this constant if externalpackages are installed to a different directory
+
+SVN_DIR="${ISSM_EXT_DIR}/svn/install"
 if [ -d "${SVN_DIR}" ]; then
 	path_prepend   "${SVN_DIR}/bin"
@@ -179,10 +181,10 @@
 fi
 
-GIT_DIR="${ISSM_DIR}/externalpackages/git/install"
+GIT_DIR="${ISSM_EXT_DIR}/git/install"
 if [ -d "${GIT_DIR}" ]; then
 	path_prepend "${GIT_DIR}/bin"
 fi
 
-MPI_DIR="${ISSM_DIR}/externalpackages/mpich/install"
+MPI_DIR="${ISSM_EXT_DIR}/mpich/install"
 if [ -d "${MPI_DIR}" ]; then
 	export MPI_DIR
@@ -194,5 +196,5 @@
 fi
 
-PETSC_DIR="${ISSM_DIR}/externalpackages/petsc/install"
+PETSC_DIR="${ISSM_EXT_DIR}/petsc/install"
 if [ -d "$PETSC_DIR" ]; then
 	export PETSC_DIR
@@ -210,17 +212,17 @@
 fi
 
-LAPACK_DIR="${ISSM_DIR}/externalpackages/lapack/install"
+LAPACK_DIR="${ISSM_EXT_DIR}/lapack/install"
 ld_library_path_append "${LAPACK_DIR}/lib"
 
-SCOTCH_DIR="${ISSM_DIR}/externalpackages/scotch/install"
+SCOTCH_DIR="${ISSM_EXT_DIR}/scotch/install"
 ld_library_path_append "$SCOTCH_DIR/lib"
 
-SLEPC_DIR="${ISSM_DIR}/externalpackages/slepc/install"
+SLEPC_DIR="${ISSM_EXT_DIR}/slepc/install"
 ld_library_path_append "$SLEPC_DIR/lib"
 
-TAO_DIR="${ISSM_DIR}/externalpackages/tao/install"
+TAO_DIR="${ISSM_EXT_DIR}/tao/install"
 ld_library_path_append "$TAO_DIR/lib"
 
-DAKOTA_DIR="${ISSM_DIR}/externalpackages/dakota/install"
+DAKOTA_DIR="${ISSM_EXT_DIR}/dakota/install"
 if [ -d "${DAKOTA_DIR}" ]; then
 	path_append "${DAKOTA_DIR}/bin"
@@ -229,8 +231,8 @@
 fi
 
-DOXYGEN_DIR="${ISSM_DIR}/externalpackages/doxygen/install"
+DOXYGEN_DIR="${ISSM_EXT_DIR}/doxygen/install"
 path_prepend "$DOXYGEN_DIR/bin"
 
-AUTOTOOLS_DIR="${ISSM_DIR}/externalpackages/autotools/install"
+AUTOTOOLS_DIR="${ISSM_EXT_DIR}/autotools/install"
 path_prepend "$AUTOTOOLS_DIR/bin"
 
@@ -238,17 +240,17 @@
 path_append "$SDK_DIR"
 
-SSH_DIR="${ISSM_DIR}/externalpackages/ssh"
+SSH_DIR="${ISSM_EXT_DIR}/ssh"
 path_append "$SSH_DIR"
 
-VALGRIND_DIR="${ISSM_DIR}/externalpackages/valgrind/install"
+VALGRIND_DIR="${ISSM_EXT_DIR}/valgrind/install"
 path_prepend "$VALGRIND_DIR/bin"
 
-NCO_DIR="${ISSM_DIR}/externalpackages/nco/install/bin"
+NCO_DIR="${ISSM_EXT_DIR}/nco/install/bin"
 path_prepend "$NCO_DIR/bin"
 
-CPPCHECK_DIR="${ISSM_DIR}/externalpackages/cppcheck/install"
+CPPCHECK_DIR="${ISSM_EXT_DIR}/cppcheck/install"
 path_append "$CPPCHECK_DIR/bin"
 
-MERCURIAL_DIR="${ISSM_DIR}/externalpackages/mercurial/install"
+MERCURIAL_DIR="${ISSM_EXT_DIR}/mercurial/install"
 if [ -d "$MERCURIAL_DIR" ]; then
 	export PYTHONPATH="$PYTHONPATH:$MERCURIAL_DIR/mercurial/pure/"
@@ -256,6 +258,6 @@
 fi
 
-BOOST_DIR="${ISSM_DIR}/externalpackages/boost/install"
-BOOSTROOT="${ISSM_DIR}/externalpackages/boost/install"
+BOOST_DIR="${ISSM_EXT_DIR}/boost/install"
+BOOSTROOT="${ISSM_EXT_DIR}/boost/install"
 if [ -d "${BOOST_DIR}" ]; then
 	export BOOSTROOT
@@ -267,12 +269,12 @@
 fi
 
-XERCESROOT="${ISSM_DIR}/externalpackages/xerces/install"
+XERCESROOT="${ISSM_EXT_DIR}/xerces/install"
 if [ -d "$XERCESROOT" ]; then
 	export XERCESROOT
-	export XERCESCROOT="${ISSM_DIR}/externalpackages/xerces/src"
-fi
-
-
-XAIFBOOSTERROOT="${ISSM_DIR}/externalpackages/xaifbooster"
+	export XERCESCROOT="${ISSM_EXT_DIR}/xerces/src"
+fi
+
+
+XAIFBOOSTERROOT="${ISSM_EXT_DIR}/xaifbooster"
 XAIF_DIR="${XAIFBOOSTERROOT}/xaifBooster"
 if [ -d "$XAIF_DIR" ]; then
@@ -283,10 +285,10 @@
 fi
 
-ANGELROOT="${ISSM_DIR}/externalpackages/angel/angel"
+ANGELROOT="${ISSM_EXT_DIR}/angel/angel"
 if [ -d "$ANGELROOT" ]; then
 	export ANGELROOT
 fi
 
-OPENANALYSISROOT="${ISSM_DIR}/externalpackages/openanalysis/install"
+OPENANALYSISROOT="${ISSM_EXT_DIR}/openanalysis/install"
 if [ -d "$OPENANALYSISROOT" ]; then
 	export OPENANALYSISROOT
@@ -297,40 +299,40 @@
 ld_library_path_append "$JVM_DIR"
 
-BBFTP_DIR="${ISSM_DIR}/externalpackages/bbftp/install"
+BBFTP_DIR="${ISSM_EXT_DIR}/bbftp/install"
 path_append "$BBFTP_DIR/bin"
 
-ADIC_DIR="${ISSM_DIR}/externalpackages/adic/install"
+ADIC_DIR="${ISSM_EXT_DIR}/adic/install"
 path_append "$ADIC_DIR/bin"
 ld_library_path_append "$ADIC_DIR/lib"
 
-COLPACK_DIR="${ISSM_DIR}/externalpackages/colpack/install"
+COLPACK_DIR="${ISSM_EXT_DIR}/colpack/install"
 ld_library_path_append "$COLPACK_DIR/lib"
 
-ECLIPSE_DIR="${ISSM_DIR}/externalpackages/eclipse/install"
+ECLIPSE_DIR="${ISSM_EXT_DIR}/eclipse/install"
 path_append "$ECLIPSE_DIR"
 
-APPSCAN_DIR="${ISSM_DIR}/externalpackages/appscan/install"
+APPSCAN_DIR="${ISSM_EXT_DIR}/appscan/install"
 path_append "$APPSCAN_DIR/bin"
 
-RATS_DIR="${ISSM_DIR}/externalpackages/rats/install"
+RATS_DIR="${ISSM_EXT_DIR}/rats/install"
 path_append "$RATS_DIR/bin"
 
-DYSON_DIR="${ISSM_DIR}/externalpackages/dyson/"
+DYSON_DIR="${ISSM_EXT_DIR}/dyson/"
 path_append "$DYSON_DIR"
 
-CMAKE_DIR="${ISSM_DIR}/externalpackages/cmake/install"
+CMAKE_DIR="${ISSM_EXT_DIR}/cmake/install"
 path_prepend "$CMAKE_DIR/bin"
 
-SHAPELIB_DIR="${ISSM_DIR}/externalpackages/shapelib/install"
+SHAPELIB_DIR="${ISSM_EXT_DIR}/shapelib/install"
 path_append "$SHAPELIB_DIR/exec"
 
-CCCL_DIR="${ISSM_DIR}/externalpackages/cccl/install"
+CCCL_DIR="${ISSM_EXT_DIR}/cccl/install"
 path_append "$CCCL_DIR/bin"
 
-PACKAGEMAKER_DIR="${ISSM_DIR}/externalpackages/packagemaker/install"
+PACKAGEMAKER_DIR="${ISSM_EXT_DIR}/packagemaker/install"
 path_append "$PACKAGEMAKER_DIR"
 
 #android-dev-dir
-export ANDROID_DIR="${ISSM_DIR}/externalpackages/android"
+export ANDROID_DIR="${ISSM_EXT_DIR}/android"
 
 export ANDROID_NDK_DIR="$ANDROID_DIR/android-ndk/install"
@@ -340,23 +342,23 @@
 path_append "$ANDROID_SDK_DIR/"
 
-GSL_DIR="${ISSM_DIR}/externalpackages/gsl/install"
+GSL_DIR="${ISSM_EXT_DIR}/gsl/install"
 ld_library_path_append "$GSL_DIR/lib"
 
-GMAKE_DIR="${ISSM_DIR}/externalpackages/gmake/install"
+GMAKE_DIR="${ISSM_EXT_DIR}/gmake/install"
 path_prepend "$GMAKE_DIR/bin"
 
-MODELE_DIR="${ISSM_DIR}/externalpackages/modelE/install"
+MODELE_DIR="${ISSM_EXT_DIR}/modelE/install"
 path_append "$MODELE_DIR/src/exec"
 
-NCVIEW_DIR="${ISSM_DIR}/externalpackages/ncview/install"
+NCVIEW_DIR="${ISSM_EXT_DIR}/ncview/install"
 path_append "$NCVIEW_DIR"
 
-TCLX_DIR="${ISSM_DIR}/externalpackages/tclx/install/lib/tclx8.4"
+TCLX_DIR="${ISSM_EXT_DIR}/tclx/install/lib/tclx8.4"
 ld_library_path_append "$TCLX_DIR"
 
-ASPELL_DIR="${ISSM_DIR}/externalpackages/aspell/install"
+ASPELL_DIR="${ISSM_EXT_DIR}/aspell/install"
 path_append "$ASPELL_DIR/bin"
 
-NETCDF_DIR="${ISSM_DIR}/externalpackages/netcdf/install"
+NETCDF_DIR="${ISSM_EXT_DIR}/netcdf/install"
 if [ -d "${NETCDF_DIR}" ]; then
 	path_append "${NETCDF_DIR}/bin"
@@ -367,10 +369,10 @@
 fi
 
-NETCDF_CXX_DIR="${ISSM_DIR}/externalpackages/netcdf-cxx/install"
+NETCDF_CXX_DIR="${ISSM_EXT_DIR}/netcdf-cxx/install"
 if [ -d "${NETCDF_CXX_DIR}" ]; then
 	ld_library_path_append "${NETCDF_CXX_DIR}/lib"
 fi
 
-NETCDF_PYTHON_DIR="${ISSM_DIR}/externalpackages/netcdf-python/install"
+NETCDF_PYTHON_DIR="${ISSM_EXT_DIR}/netcdf-python/install"
 if [ -d "${NETCDF_PYTHON_DIR}" ]; then
 	if [ -d "${NETCDF_PYTHON_DIR}/lib/python2.7/site-packages" ]; then
@@ -379,5 +381,5 @@
 fi
 
-HDF5_DIR="${ISSM_DIR}/externalpackages/hdf5/install"
+HDF5_DIR="${ISSM_EXT_DIR}/hdf5/install"
 if [ -d "${HDF5_DIR}" ]; then
 	cpath_append "${HDF5_DIR}/include"
@@ -387,5 +389,5 @@
 fi
 
-SQLITE_DIR="${ISSM_DIR}/externalpackages/sqlite/install"
+SQLITE_DIR="${ISSM_EXT_DIR}/sqlite/install"
 if [ -d "${SQLITE_DIR}" ]; then
 	path_append "${SQLITE_DIR}/bin"
@@ -394,5 +396,5 @@
 fi
 
-PROJ_DIR="${ISSM_DIR}/externalpackages/proj/install"
+PROJ_DIR="${ISSM_EXT_DIR}/proj/install"
 if [ -d "${PROJ_DIR}" ]; then
 	dyld_library_path_prepend "${PROJ_DIR}/lib"
@@ -400,5 +402,5 @@
 fi
 
-GDAL_DIR="${ISSM_DIR}/externalpackages/gdal/install"
+GDAL_DIR="${ISSM_EXT_DIR}/gdal/install"
 if [ -d "${GDAL_DIR}" ]; then
 	path_prepend "${GDAL_DIR}/bin"
@@ -406,5 +408,5 @@
 fi
 
-ESMF_DIR="${ISSM_DIR}/externalpackages/esmf/install"
+ESMF_DIR="${ISSM_EXT_DIR}/esmf/install"
 if [ -d "${ESMF_DIR}" ]; then
 	path_prepend "${ESMF_DIR}/bin"
@@ -412,5 +414,5 @@
 fi
 
-GMT_DIR="${ISSM_DIR}/externalpackages/gmt/install"
+GMT_DIR="${ISSM_EXT_DIR}/gmt/install"
 if [ -d "${GMT_DIR}" ]; then
 	export GMT_DIR
@@ -418,24 +420,24 @@
 fi
 
-GMSH_DIR="${ISSM_DIR}/externalpackages/gmsh/install"
+GMSH_DIR="${ISSM_EXT_DIR}/gmsh/install"
 if [ -d "${GMSH_DIR}" ]; then
-	path_append "${ISSM_DIR}/externalpackages/gmsh/install"
-fi
-
-CVS_DIR="${ISSM_DIR}/externalpackages/cvs/install"
+	path_append "${ISSM_EXT_DIR}/gmsh/install"
+fi
+
+CVS_DIR="${ISSM_EXT_DIR}/cvs/install"
 path_prepend "$CVS_DIR/bin"
 
-APR_DIR="${ISSM_DIR}/externalpackages/apr/install"
+APR_DIR="${ISSM_EXT_DIR}/apr/install"
 path_append "$APR_DIR/bin"
 ld_library_path_append "$APR_DIR/lib"
 
-APR_UTIL_DIR="${ISSM_DIR}/externalpackages/apr-util/install"
+APR_UTIL_DIR="${ISSM_EXT_DIR}/apr-util/install"
 path_prepend "$APR_UTIL_DIR/bin"
 ld_library_path_append "$APR_UTIL_DIR/lib"
 
-YAMS_DIR="${ISSM_DIR}/externalpackages/yams/install"
+YAMS_DIR="${ISSM_EXT_DIR}/yams/install"
 path_append "$YAMS_DIR"
 
-SWIG_DIR="${ISSM_DIR}/externalpackages/swig/install"
+SWIG_DIR="${ISSM_EXT_DIR}/swig/install"
 path_append "$SWIG_DIR"
 
@@ -444,15 +446,15 @@
 
 #INISHELL
-path_append "${ISSM_DIR}/externalpackages/inishell/install"
+path_append "${ISSM_EXT_DIR}/inishell/install"
 
 #SHELL2JUNIT
-path_append "${ISSM_DIR}/externalpackages/shell2junit/install"
+path_append "${ISSM_EXT_DIR}/shell2junit/install"
 
 #EXPAT
-ld_library_path_prepend "${ISSM_DIR}/externalpackages/expat/install"
-dyld_library_path_prepend "${ISSM_DIR}/externalpackages/expat/install"
+ld_library_path_prepend "${ISSM_EXT_DIR}/expat/install"
+dyld_library_path_prepend "${ISSM_EXT_DIR}/expat/install"
 
 #CURL
-CURL_DIR="${ISSM_DIR}/externalpackages/curl/install"
+CURL_DIR="${ISSM_EXT_DIR}/curl/install"
 if [ -d "${CURL_DIR}" ]; then
 	ld_library_path_prepend "${CURL_DIR}/lib"
@@ -462,10 +464,10 @@
 
 #NEOPZ
-NEOPZ_DIR="${ISSM_DIR}/externalpackages/neopz/install"
+NEOPZ_DIR="${ISSM_EXT_DIR}/neopz/install"
 if [ -d "$NEOPZ_DIR" ]; then
 	export REFPATTERNDIR="$NEOPZ_DIR/include/refpatterns"
 fi
 
-TRIANGLE_DIR="${ISSM_DIR}/externalpackages/triangle/install"
+TRIANGLE_DIR="${ISSM_EXT_DIR}/triangle/install"
 if [ -d "${TRIANGLE_DIR}" ]; then
 	ld_library_path_append "${TRIANGLE_DIR}/lib"