Index: /issm/trunk-jpl/jenkins/imac-012301-gil
===================================================================
--- /issm/trunk-jpl/jenkins/imac-012301-gil	(revision 20337)
+++ /issm/trunk-jpl/jenkins/imac-012301-gil	(revision 20338)
@@ -4,7 +4,10 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/Applications/MATLAB_R2011b.app/"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -18,7 +21,4 @@
 	--enable-debugging \
 	--enable-development'
-
-#MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2011b.app/"
 
 #PYTHON and MATLAB testing
@@ -46,5 +46,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools install.sh                
-						matlab    install.sh                
 						mpich     install-3.0-macosx64.sh    
 						cmake     install.sh                
Index: /issm/trunk-jpl/jenkins/jenkins.sh
===================================================================
--- /issm/trunk-jpl/jenkins/jenkins.sh	(revision 20337)
+++ /issm/trunk-jpl/jenkins/jenkins.sh	(revision 20338)
@@ -28,13 +28,4 @@
 	OS="win";
 fi
-#}}}
-
-#Installation ISSM
-#create matlab's installation sript {{{
-cat << END > $ISSM_DIR/externalpackages/matlab/install.sh
-#!/bin/bash
-rm -rf install
-ln -s $MATLAB_PATH install
-END
 #}}}
 
@@ -227,7 +218,7 @@
 	cd $ISSM_DIR/test/NightlyRun
 	if [ "$OS" = "win" ]; then
-		$ISSM_DIR_WIN/externalpackages/matlab/install/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR_WIN/src/m/dev; devpath; addpath $ISSM_DIR_WIN/nightlylog/; matlab_run$i" -logfile $ISSM_DIR_WIN/nightlylog/matlab_log$i.log &
+		$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR_WIN/src/m/dev; devpath; addpath $ISSM_DIR_WIN/nightlylog/; matlab_run$i" -logfile $ISSM_DIR_WIN/nightlylog/matlab_log$i.log &
 	else
-		$ISSM_DIR/externalpackages/matlab/install/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log &
+		$MATLAB_PATH/bin/matlab -nojvm -nosplash -r "addpath $ISSM_DIR/src/m/dev; devpath; addpath $ISSM_DIR/nightlylog/; matlab_run$i" -logfile $ISSM_DIR/nightlylog/matlab_log$i.log &
 	fi
 done
Index: /issm/trunk-jpl/jenkins/linux64_caladan
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_caladan	(revision 20338)
@@ -4,8 +4,11 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR\
 	--disable-static \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -25,7 +28,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #PYTHON and MATLAB testing
@@ -56,5 +56,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh                
-						matlab        install.sh                
 						mpich         install-3.0-linux64.sh    
 						petsc         install-3.5-linux64.sh    
Index: /issm/trunk-jpl/jenkins/linux64_caladan_ad
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan_ad	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_caladan_ad	(revision 20338)
@@ -3,4 +3,7 @@
 # 1: ISSM general configuration #
 #-------------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #ISSM CONFIGURATION 
@@ -13,8 +16,5 @@
 				--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
 				--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
-				--with-matlab-dir=$MATLAB_DIR \
-				--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install '
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
+				--with-matlab-dir=$MATLAB_PATH 
 
 #PYTHON and MATLAB testing
@@ -44,5 +44,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools install.sh                
-					 matlab install.sh 
 					 mpich install-3.0-linux64.sh
 					 petsc install-3.5-linux64.sh
Index: /issm/trunk-jpl/jenkins/linux64_caladan_ampi
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan_ampi	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_caladan_ampi	(revision 20338)
@@ -1,5 +1,9 @@
+
 #-------------------------------#
 # 1: ISSM general configuration #
 #-------------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #ISSM CONFIGURATION 
@@ -12,5 +16,5 @@
 				 --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
 				 --with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
-				 --with-matlab-dir=$MATLAB_DIR \
+				 --with-matlab-dir=$MATLAB_PATH \
 				 --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
 				 --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -23,7 +27,4 @@
 				 --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
 				 --enable-development '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #PYTHON and MATLAB testing
@@ -53,5 +54,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools install.sh 
-					 matlab install.sh 
 					 mpich install-3.0-linux64.sh
 					 petsc install-3.5-linux64.sh
Index: /issm/trunk-jpl/jenkins/linux64_murdo
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_murdo	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_murdo	(revision 20338)
@@ -4,7 +4,10 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/usr/local/matlab80/"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR\
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -24,7 +27,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/matlab80/"
 
 #PYTHON and MATLAB testing
@@ -55,5 +55,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh                
-						matlab        install.sh                
 						mpich         install-3.0-linux64.sh    
 						cmake         install.sh                
Index: /issm/trunk-jpl/jenkins/linux64_murdo_ad
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_murdo_ad	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_murdo_ad	(revision 20338)
@@ -3,4 +3,7 @@
 # 1: ISSM general configuration #
 #-------------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/matlab80/"
 
 #ISSM CONFIGURATION 
@@ -12,8 +15,5 @@
 				--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
 				--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
-				--with-matlab-dir=$MATLAB_DIR \
-				--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install '
-#MATLAB path
-MATLAB_PATH="/usr/local/matlab80/"
+				--with-matlab-dir=$MATLAB_PATH 
 
 #PYTHON and MATLAB testing
@@ -44,5 +44,4 @@
 EXTERNALPACKAGES="autotools install.sh                
 					 cmake install.sh 
-					 matlab install.sh 
 					 mpich install-3.0-linux64.sh
 					 petsc install-3.5-linux64.sh
Index: /issm/trunk-jpl/jenkins/linux64_murdo_ampi
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_murdo_ampi	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_murdo_ampi	(revision 20338)
@@ -3,4 +3,7 @@
 # 1: ISSM general configuration #
 #-------------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/matlab80/"
 
 #ISSM CONFIGURATION 
@@ -12,5 +15,5 @@
 				  --with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
 				  --with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
-				  --with-matlab-dir=$MATLAB_DIR \
+				  --with-matlab-dir=$MATLAB_PATH \
 				  --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
 				  --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -23,7 +26,4 @@
 				  --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
 				  --enable-development \
-				  --enable-debugging CXXFLAGS="-g -O0" '
-#MATLAB path
-MATLAB_PATH="/usr/local/matlab80/"
 
 #PYTHON and MATLAB testing
@@ -54,5 +54,4 @@
 EXTERNALPACKAGES="autotools install.sh 
 					 cmake install.sh 
-					 matlab install.sh 
 					 mpich install-3.0-linux64.sh
 					 petsc install-3.5-linux64.sh
Index: /issm/trunk-jpl/jenkins/linux64_murdo_gia
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_murdo_gia	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_murdo_gia	(revision 20338)
@@ -4,7 +4,10 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/usr/local/matlab80/"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR\
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -20,7 +23,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/matlab80/"
 
 #PYTHON and MATLAB testing
@@ -50,5 +50,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh                
-						matlab        install.sh                
 						mpich         install-3.0-linux64.sh    
 						cmake         install.sh                
Index: /issm/trunk-jpl/jenkins/linux64_murdo_iceocean
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_murdo_iceocean	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_murdo_iceocean	(revision 20338)
@@ -4,7 +4,10 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/usr/local/matlab80/"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR\
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -18,7 +21,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/matlab80/"
 
 #PYTHON and MATLAB testing
@@ -48,5 +48,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh                
-						matlab        install.sh                
 						mpich         install-3.0-linux64.sh    
 						cmake         install.sh                
Index: /issm/trunk-jpl/jenkins/linux64_murdo_python
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_murdo_python	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_murdo_python	(revision 20338)
@@ -25,4 +25,5 @@
 
 #MATLAB path
+MATLAB_PATH=''
 
 #PYTHON and MATLAB testing
Index: /issm/trunk-jpl/jenkins/linux64_ross
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_ross	(revision 20338)
@@ -4,8 +4,11 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR\
 	--disable-static \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -25,7 +28,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #PYTHON and MATLAB testing
@@ -56,5 +56,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh                
-						matlab        install.sh                
 						mpich         install-3.0-linux64.sh    
 						petsc         install-3.5-linux64.sh    
Index: /issm/trunk-jpl/jenkins/linux64_ross_ad
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_ad	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_ross_ad	(revision 20338)
@@ -3,4 +3,7 @@
 # 1: ISSM general configuration #
 #-------------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #ISSM CONFIGURATION 
@@ -13,10 +16,7 @@
 				--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
 				--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
-				--with-matlab-dir=$MATLAB_DIR \
+				--with-matlab-dir=$MATLAB_PATH \
 				--with-python-dir=/usr\
 				--with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy\
-				--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install '
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #PYTHON and MATLAB testing
@@ -46,5 +46,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools install.sh                
-					 matlab install.sh 
 					 mpich install-3.0-linux64.sh
 					 petsc install-3.5-linux64.sh
Index: /issm/trunk-jpl/jenkins/linux64_ross_ampi
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_ampi	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_ross_ampi	(revision 20338)
@@ -1,5 +1,9 @@
+#
 #-------------------------------#
 # 1: ISSM general configuration #
 #-------------------------------#
+
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #ISSM CONFIGURATION 
@@ -12,5 +16,5 @@
 				--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
 				--with-ampi-dir=$ISSM_DIR/externalpackages/adjoinablempi/install \
-				--with-matlab-dir=$MATLAB_DIR \
+				--with-matlab-dir=$MATLAB_PATH \
 				--with-python-dir=/usr\
 				--with-python-numpy-dir=/usr/lib/python2.7/dist-packages/numpy\
@@ -25,7 +29,4 @@
 				--with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.9/ -lgfortran" \
 				--enable-development '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #PYTHON and MATLAB testing
@@ -55,5 +56,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools install.sh 
-					 matlab install.sh 
 					 mpich install-3.0-linux64.sh
 					 petsc install-3.5-linux64.sh
Index: /issm/trunk-jpl/jenkins/linux64_ross_gia
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_gia	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_ross_gia	(revision 20338)
@@ -4,8 +4,11 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR\
 	--disable-static \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -21,7 +24,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #PYTHON and MATLAB testing
@@ -51,5 +51,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh
-						matlab        install.sh                
 						mpich         install-3.0-linux64.sh    
 						petsc         install-3.5-linux64.sh    
Index: /issm/trunk-jpl/jenkins/linux64_ross_iceocean
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_iceocean	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_ross_iceocean	(revision 20338)
@@ -4,8 +4,11 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR\
 	--disable-static \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -19,7 +22,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #PYTHON and MATLAB testing
@@ -49,5 +49,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh                
-						matlab        install.sh                
 						mpich         install-3.0-linux64.sh    
 						cmake         install.sh                
Index: /issm/trunk-jpl/jenkins/linux64_ross_se
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_se	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_ross_se	(revision 20338)
@@ -4,8 +4,11 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR\
 	--disable-static \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -20,7 +23,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #PYTHON and MATLAB testing
@@ -51,5 +51,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh                
-						matlab        install.sh                
 						mpich         install-3.0-linux64.sh    
 						petsc         install-3.5-linux64.sh    
Index: /issm/trunk-jpl/jenkins/linux64_ross_test
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_test	(revision 20337)
+++ /issm/trunk-jpl/jenkins/linux64_ross_test	(revision 20338)
@@ -1,10 +1,14 @@
+#
 #-------------------------------#
 # 1: ISSM general configuration #
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/usr/local/MATLAB/R2015a"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR\
 	--disable-static \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -24,7 +28,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/usr/local/MATLAB/R2015a"
 
 #PYTHON and MATLAB testing
@@ -55,5 +56,4 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="autotools     install.sh                
-						matlab        install.sh                
 						mpich         install-3.0-linux64.sh    
 						petsc         install-3.5-linux64.sh    
Index: /issm/trunk-jpl/jenkins/macosx_pine-island
===================================================================
--- /issm/trunk-jpl/jenkins/macosx_pine-island	(revision 20337)
+++ /issm/trunk-jpl/jenkins/macosx_pine-island	(revision 20338)
@@ -4,7 +4,10 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -18,7 +21,4 @@
 	--enable-debugging \
 	--enable-development'
-
-#MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
 
 #PYTHON and MATLAB testing
@@ -49,5 +49,4 @@
 EXTERNALPACKAGES="autotools    install.sh
 						cmake        install.sh
-						matlab       install.sh
 						mpich        install-3.0-macosx64.sh
 						m1qn3        install.sh
Index: /issm/trunk-jpl/jenkins/macosx_pine-island_dakota
===================================================================
--- /issm/trunk-jpl/jenkins/macosx_pine-island_dakota	(revision 20337)
+++ /issm/trunk-jpl/jenkins/macosx_pine-island_dakota	(revision 20338)
@@ -4,7 +4,10 @@
 #-------------------------------#
 
+#MATLAB path
+MATLAB_PATH="/Applications/MATLAB_R2015a.app/"
+
 #ISSM CONFIGURATION 
 ISSM_CONFIG='--prefix=$ISSM_DIR \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
@@ -21,7 +24,4 @@
 	--enable-debugging \
 	--enable-development'
-
-#MATLAB path
-MATLAB_PATH="/Applications/MATLAB_R2015a.app/"
 
 #PYTHON and MATLAB testing
@@ -52,5 +52,4 @@
 EXTERNALPACKAGES="autotools    install.sh
 						cmake 		 install.sh
-						matlab       install.sh
 						mpich        install-3.0-macosx64.sh
 						chaco        install-macosx64.sh
Index: /issm/trunk-jpl/jenkins/windows
===================================================================
--- /issm/trunk-jpl/jenkins/windows	(revision 20337)
+++ /issm/trunk-jpl/jenkins/windows	(revision 20338)
@@ -3,4 +3,7 @@
 # 1: ISSM general configuration #
 #-------------------------------#
+
+#MATLAB path
+MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a/"
 
 #ISSM CONFIGURATION 
@@ -12,5 +15,5 @@
 	--without-Gia \
 	--without-kriging \
-	--with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
 	--with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
@@ -22,7 +25,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a/"
 
 #PYTHON and MATLAB testing
@@ -53,5 +53,4 @@
 						metis       install-4.0-win7.sh
 						triangle    install-win7.sh        
-						matlab      install.sh
 						shell2junit install.sh"
 
Index: /issm/trunk-jpl/jenkins/windows-par
===================================================================
--- /issm/trunk-jpl/jenkins/windows-par	(revision 20337)
+++ /issm/trunk-jpl/jenkins/windows-par	(revision 20338)
@@ -3,4 +3,7 @@
 # 1: ISSM general configuration #
 #-------------------------------#
+
+#MATLAB path
+MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a/"
 
 #ISSM CONFIGURATION 
@@ -12,5 +15,5 @@
 	--without-Gia \
 	--without-kriging \
-	--with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
+	--with-matlab-dir=$MATLAB_PATH \
 	--with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
 	--with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
@@ -21,7 +24,4 @@
 	--enable-development \
 	--enable-debugging '
-
-#MATLAB path
-MATLAB_PATH="/cygdrive/c/Programs/MATLAB/R2015a/"
 
 #PYTHON and MATLAB testing
@@ -48,9 +48,8 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="				autotools   install-win.sh
+EXTERNALPACKAGES="autotools   install-win.sh
 						petsc       install-dev-win10-par.sh
 						metis       install-4.0-win7.sh
 						triangle    install-win7.sh        
-						matlab      install.sh
 						shell2junit install.sh"