Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh	(revision 13722)
+++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh	(revision 13723)
@@ -30,10 +30,6 @@
 patch -R ./src/include/mpicxx.h ../configs/1.0.2/altix64/mpicxx.h.patch
 
-#Compile mpich2
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
+#Compile mpich2 (parallel make not supported)
+make
 make install 
 
Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh	(revision 13722)
+++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh	(revision 13723)
@@ -30,9 +30,5 @@
 patch -R ./src/include/mpicxx.h ../configs/1.0.2/linux64/mpicxx.h.patch
 
-#Compile mpich2
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
+#Compile mpich2 (parallel make not supported)
+make
 make install 
Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh	(revision 13722)
+++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh	(revision 13723)
@@ -29,10 +29,6 @@
 patch -R ./src/include/mpicxx.h ../configs/1.0.2/macosx32/mpicxx.h.patch
 
-#Compile mpich2
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
+#Compile mpich2 (parallel make not supported)
+make
 make install 
 
Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh	(revision 13722)
+++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh	(revision 13723)
@@ -27,10 +27,6 @@
 patch -R ./src/include/mpicxx.h ../configs/1.0.2/win32/mpicxx.h.patch
 
-#Compile mpich2
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
+#Compile mpich2 (parallel make not supported)
+make
 make install 
 
Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.3.1-linux64-berg.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich2/install-1.3.1-linux64-berg.sh	(revision 13722)
+++ /issm/trunk-jpl/externalpackages/mpich2/install-1.3.1-linux64-berg.sh	(revision 13723)
@@ -36,13 +36,5 @@
 fi
 
-#Compile mpich2
-if [ $# -eq 0 ];
-then
-	make
-else
-	make -j $1
-fi
+#Compile mpich2 (parallel make not supported)
+make
 make install 
-
-cd ../install/lib
-rm -rf *.so
Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh	(revision 13722)
+++ /issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh	(revision 13723)
@@ -26,9 +26,5 @@
 	--enable-f91=gfortran 
 
-#Compile mpich2
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
+#Compile mpich2 (parallel make not supported)
+make
 make install 
Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh	(revision 13722)
+++ /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh	(revision 13723)
@@ -28,9 +28,5 @@
 	--enable-fc
 
-#Compile mpich2
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
+#Compile mpich2 (parallel make not supported)
+make
 make install 
Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh	(revision 13722)
+++ /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh	(revision 13723)
@@ -28,9 +28,5 @@
 	--enable-fc
 
-#Compile mpich2
-if [ $# -eq 0 ]; then
-	make
-else
-	make -j $1
-fi
+#Compile mpich2 (parallel make not supported)
+make
 make install 
Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.5-linux64.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/mpich2/install-1.5-linux64.sh	(revision 13723)
+++ /issm/trunk-jpl/externalpackages/mpich2/install-1.5-linux64.sh	(revision 13723)
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -eu
+
+#Some cleanup
+rm -rf src install mpich2-1.5
+mkdir src install
+
+#Download from ISSM server
+#$ISSM_DIR/scripts/DownloadExternalPackage.py 'http://issm.jpl.nasa.gov/files/externalpackages/mpich2-1.5.tar.gz' 'mpich2-1.5.tar.gz'
+
+#Untar 
+tar -zxvf  mpich2-1.5.tar.gz
+
+#Move mpich2 into src directory
+mv mpich2-1.5/* src
+rm -rf mpich2-1.5
+
+#Configure mpich2
+cd src
+#export -n F90 
+#export CFLAGS="$CFLAGS -fPIC"
+#export FFLAGS="$FFLAGS -fPIC"
+./configure \
+	--prefix="$ISSM_DIR/externalpackages/mpich2/install" \
+	--enable-shared \
+	--enable-sharedlibs=gcc \
+	--enable-f91=gfortran 
+
+#Compile mpich2 (this new version supports parallel make)
+if [ $# -eq 0 ]; then
+	make
+else
+	make -j $1
+fi
+make install