Index: /issm/trunk-jpl/etc/environment.csh
===================================================================
--- /issm/trunk-jpl/etc/environment.csh	(revision 21722)
+++ /issm/trunk-jpl/etc/environment.csh	(revision 21723)
@@ -3,12 +3,4 @@
 #Load ISSM scripts
 setenv PATH {$PATH}:{$ISSM_DIR}/scripts
-
-##MATLAB
-#set MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
-#if (-e $MATLAB_DIR) then
-#	setenv MATLAB_DIR {$MATLAB_DIR}
-#	setenv PATH {$MATLAB_DIR}/bin:{$PATH}
-#	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$MATLAB_DIR}/bin/glnxa64
-#endif
 
 #MPI
Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 21722)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 21723)
@@ -67,14 +67,11 @@
 pathappend "$ISSM_DIR/scripts"
 
-#MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
-#export MATLAB_DIR
-#pathprepend   "$MATLAB_DIR/bin" #take precedence over /usr/local/bin/matlab
-#libpathappend "$MATLAB_DIR/lib"
-
 #GMT 
 GMT_DIR="$ISSM_DIR/externalpackages/gmt/install"
-export GMT_DIR
-pathprepend   "$GMT_DIR/bin" 
-libpathappend "$GMT_DIR/lib"
+if [ -d "$GMT_DIR" ]; then
+	export GMT_DIR
+	pathprepend   "$GMT_DIR/bin" 
+	libpathappend "$GMT_DIR/lib"
+fi
 
 #legacy mpich2 (To be removed)
@@ -89,9 +86,8 @@
 if [ -d "$MPI_DIR" ]; then
 	export MPI_DIR
+	export MPI_INC_DIR="$MPI_DIR/include"
 	pathprepend   "$MPI_DIR/bin"
 	libpathappend "$MPI_DIR/lib"
 fi
-
-export MPI_INC_DIR="$MPI_DIR/include"
 
 PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"