Index: /issm/trunk-jpl/configs/config-discover.sh
===================================================================
--- /issm/trunk-jpl/configs/config-discover.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-discover.sh	(revision 15784)
@@ -6,5 +6,5 @@
 ./configure \
  --prefix=$ISSM_DIR \
- --with-matlab-dir=$MATLAB_DIR \
+ --with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
  --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
Index: /issm/trunk-jpl/configs/config-linux64-larsen-ad.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-larsen-ad.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-linux64-larsen-ad.sh	(revision 15784)
@@ -8,4 +8,4 @@
 	--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
 	--with-adolc-version=3 \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
Index: /issm/trunk-jpl/configs/config-linux64-murdo-ad.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-murdo-ad.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-linux64-murdo-ad.sh	(revision 15784)
@@ -7,4 +7,4 @@
 	--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
 	--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install
Index: /issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh	(revision 15784)
@@ -5,5 +5,5 @@
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
  --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
- --with-matlab-dir=$MATLAB_DIR \
+ --with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
  --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
Index: /issm/trunk-jpl/configs/config-linux64-murdo.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-murdo.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-linux64-murdo.sh	(revision 15784)
@@ -6,5 +6,5 @@
 ./configure \
 	--prefix=$ISSM_DIR \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
Index: /issm/trunk-jpl/configs/config-linux64-ubuntu64.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-ubuntu64.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-linux64-ubuntu64.sh	(revision 15784)
@@ -3,5 +3,5 @@
 ./configure \
  --prefix=$ISSM_DIR \
- --with-matlab-dir=$MATLAB_DIR \
+ --with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
  --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
Index: /issm/trunk-jpl/configs/config-macosx64-ogive.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-ogive.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-macosx64-ogive.sh	(revision 15784)
@@ -10,5 +10,5 @@
 ./configure \
 	--prefix=$ISSM_DIR \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
Index: /issm/trunk-jpl/configs/config-macosx64.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-macosx64.sh	(revision 15784)
@@ -6,5 +6,5 @@
 ./configure \
 	--prefix=$ISSM_DIR \
-	--with-matlab-dir=$MATLAB_DIR \
+	--with-matlab-dir="$ISSM_DIR/externalpackages/matlab/install" \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
 	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
Index: /issm/trunk-jpl/configs/config-win7-32.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7-32.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-win7-32.sh	(revision 15784)
@@ -5,5 +5,5 @@
    --disable-static \
    --with-vendor=intel-win7-32  \
-   --with-matlab-dir="$MATLAB_DIR" \
+   --with-matlab-dir=""$ISSM_DIR/externalpackages/matlab/install"" \
    --with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install" \
    --with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
Index: /issm/trunk-jpl/configs/config-win7-64.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7-64.sh	(revision 15783)
+++ /issm/trunk-jpl/configs/config-win7-64.sh	(revision 15784)
@@ -5,5 +5,5 @@
    --disable-static \
 	--with-vendor=intel-win7-64  \
-	--with-matlab-dir="$MATLAB_DIR" \
+	--with-matlab-dir=""$ISSM_DIR/externalpackages/matlab/install"" \
 	--with-triangle-dir="$ISSM_DIR/externalpackages/triangle/install" \
 	--with-metis-dir="$ISSM_DIR/externalpackages/metis/install" \