Index: /issm/trunk-jpl/externalpackages/autotools/install-linux.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/autotools/install-linux.sh	(revision 25981)
+++ /issm/trunk-jpl/externalpackages/autotools/install-linux.sh	(revision 25982)
@@ -10,14 +10,16 @@
 M4_VER="1.4.18"
 
+PREFIX="${ISSM_DIR}/externalpackages/autotools/install" # Set to location where external package should be installed
+
 ## Environment
 #
-export PATH="${ISSM_DIR}/externalpackages/autotools/install/bin:$PATH"
+export PATH="${PREFIX}/bin:${PATH}"
 
 # Cleanup
-rm -rf install src
-mkdir install
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX}
 
 # Install m4
-echo " === INSTALLING M4 =="
+echo " === INSTALLING M4 ==="
 ${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m4-${M4_VER}.tar.gz" "m4-${M4_VER}.tar.gz"
 tar -zxvf m4-${M4_VER}.tar.gz
@@ -32,5 +34,5 @@
 echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h
 
-./configure --prefix="${ISSM_DIR}/externalpackages/autotools/install"
+./configure --prefix="${PREFIX}"
 if [ $# -eq 0 ]; then
 	make
@@ -43,5 +45,5 @@
 
 # Install Autoconf
-echo " === INSTALLING AUTOCONF =="
+echo " === INSTALLING AUTOCONF ==="
 rm -rf src
 ${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/autoconf-${AUTOCONF_VER}.tar.gz" "autoconf-${AUTOCONF_VER}.tar.gz"
@@ -49,5 +51,5 @@
 mv autoconf-${AUTOCONF_VER} src
 cd src
-./configure --prefix="${ISSM_DIR}/externalpackages/autotools/install"
+./configure --prefix="${PREFIX}"
 if [ $# -eq 0 ]; then
 	make
@@ -58,7 +60,6 @@
 fi
 cd ..
-
 # Install Automake
-echo " === INSTALLING AUTOMAKE =="
+echo " === INSTALLING AUTOMAKE ==="
 rm -rf src
 ${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/automake-${AUTOMAKE_VER}.tar.gz" "automake-${AUTOMAKE_VER}.tar.gz"
@@ -66,5 +67,5 @@
 mv automake-${AUTOMAKE_VER} src
 cd src
-./configure --prefix="${ISSM_DIR}/externalpackages/autotools/install"
+./configure --prefix="${PREFIX}"
 if [ $# -eq 0 ]; then
 	make
@@ -77,12 +78,11 @@
 
 # Install libtool
-echo " === INSTALLING LIBTOOL =="
+echo " === INSTALLING LIBTOOL ==="
 rm -rf src
 ${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/libtool-${LIBTOOL_VER}.tar.gz" "libtool-${LIBTOOL_VER}.tar.gz"
 tar -zxvf libtool-${LIBTOOL_VER}.tar.gz
-rm libtool-${LIBTOOL_VER}.tar.gz
 mv libtool-${LIBTOOL_VER} src
 cd src
-./configure --prefix="${ISSM_DIR}/externalpackages/autotools/install"
+./configure --prefix="${PREFIX}"
 if [ $# -eq 0 ]; then
 	make
Index: /issm/trunk-jpl/externalpackages/autotools/install-mac.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/autotools/install-mac.sh	(revision 25982)
+++ /issm/trunk-jpl/externalpackages/autotools/install-mac.sh	(revision 25982)
@@ -0,0 +1,88 @@
+#!/bin/bash
+set -eu
+
+
+## Constants
+#
+AUTOCONF_VER="2.69"
+AUTOMAKE_VER="1.16.1"
+LIBTOOL_VER="2.4.2"
+M4_VER="1.4.18"
+
+PREFIX="${ISSM_DIR}/externalpackages/autotools/install" # Set to location where external package should be installed
+
+## Environment
+#
+export PATH="${PREFIX}/bin:${PATH}"
+
+# Cleanup
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX}
+
+# Install m4
+echo " === INSTALLING M4 ==="
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m4-${M4_VER}.tar.gz" "m4-${M4_VER}.tar.gz"
+tar -zxvf m4-${M4_VER}.tar.gz
+mv m4-${M4_VER} src
+cd src
+
+./configure --prefix="${PREFIX}"
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
+cd ..
+
+# Install Autoconf
+echo " === INSTALLING AUTOCONF =="
+rm -rf src
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/autoconf-${AUTOCONF_VER}.tar.gz" "autoconf-${AUTOCONF_VER}.tar.gz"
+tar -zxvf autoconf-${AUTOCONF_VER}.tar.gz
+mv autoconf-${AUTOCONF_VER} src
+cd src
+./configure --prefix="${PREFIX}"
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
+cd ..
+
+# Install Automake
+echo " === INSTALLING AUTOMAKE ==="
+rm -rf src
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/automake-${AUTOMAKE_VER}.tar.gz" "automake-${AUTOMAKE_VER}.tar.gz"
+tar -zxvf automake-${AUTOMAKE_VER}.tar.gz
+mv automake-${AUTOMAKE_VER} src
+cd src
+./configure --prefix="${PREFIX}"
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
+cd ..
+
+# Install libtool
+echo " === INSTALLING LIBTOOL ==="
+rm -rf src
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/libtool-${LIBTOOL_VER}.tar.gz" "libtool-${LIBTOOL_VER}.tar.gz"
+tar -zxvf libtool-${LIBTOOL_VER}.tar.gz
+mv libtool-${LIBTOOL_VER} src
+cd src
+./configure --prefix="${PREFIX}"
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
+cd ..
Index: /issm/trunk-jpl/externalpackages/autotools/install-win.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/autotools/install-win.sh	(revision 25981)
+++ /issm/trunk-jpl/externalpackages/autotools/install-win.sh	(revision 25982)
@@ -2,76 +2,88 @@
 set -eu
 
+
+## Constants
+#
 AUTOCONF_VER="2.69"
-AUTOMAKE_MIN_VER="1.16"
-AUTOMAKE_BUILD_VER="${AUTOMAKE_MIN_VER}.1"
+AUTOMAKE_VER="1.16.1"
 LIBTOOL_VER="2.4.2"
-M4_VER="1.4.17"
+M4_VER="1.4.18"
 
-AUTOCONF="autoconf-${AUTOCONF_VER}"
-AUTOMAKE="automake-${AUTOMAKE_BUILD_VER}"
-LIBTOOL="libtool-${LIBTOOL_VER}"
-M4="m4-${M4_VER}"
+PREFIX="${ISSM_DIR}/externalpackages/autotools/install" # Set to location where external package should be installed
 
-AUTOCONF_TARBALL="${AUTOCONF}.tar.gz"
-AUTOMAKE_TARBALL="${AUTOMAKE}.tar.gz"
-LIBTOOL_TARBALL="${LIBTOOL}.tar.gz"
-M4_TARBALL="${M4}.tar.gz"
+## Environment
+#
+export PATH="${PREFIX}/bin:${PATH}"
 
-# Clean up existing assets
-rm -rf install src
-
-# Set up for installation
-mkdir install
-export PATH="$ISSM_DIR/externalpackages/autotools/install/bin:$PATH"
+# Cleanup
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX}
 
 # Install m4
-echo " === INSTALLING M4 =="
-$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${M4_TARBALL}" $M4_TARBALL
-tar -zxvf $M4_TARBALL
-rm -f $M4_TARBALL
-mv $M4 src
+echo " === INSTALLING M4 ==="
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m4-${M4_VER}.tar.gz" "m4-${M4_VER}.tar.gz"
+tar -zxvf m4-${M4_VER}.tar.gz
+mv m4-${M4_VER} src
 cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
-make install
+
+./configure --prefix="${PREFIX}"
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
 cd ..
 
-# Install autoconf
+# Install Autoconf
 echo " === INSTALLING AUTOCONF =="
 rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${AUTOCONF_TARBALL}" $AUTOCONF_TARBALL
-tar -zxvf $AUTOCONF_TARBALL
-rm -f $AUTOCONF_TARBALL
-mv $AUTOCONF src
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/autoconf-${AUTOCONF_VER}.tar.gz" "autoconf-${AUTOCONF_VER}.tar.gz"
+tar -zxvf autoconf-${AUTOCONF_VER}.tar.gz
+mv autoconf-${AUTOCONF_VER} src
 cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
-make install
+./configure --prefix="${PREFIX}"
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
 cd ..
 
-# Install automake
-echo " === INSTALLING AUTOMAKE =="
+# Install Automake
+echo " === INSTALLING AUTOMAKE ==="
 rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${AUTOMAKE_TARBALL}" $AUTOMAKE_TARBALL
-tar -zxvf $AUTOMAKE_TARBALL
-rm -f $AUTOMAKE_TARBALL
-mv $AUTOMAKE src
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/automake-${AUTOMAKE_VER}.tar.gz" "automake-${AUTOMAKE_VER}.tar.gz"
+tar -zxvf automake-${AUTOMAKE_VER}.tar.gz
+mv automake-${AUTOMAKE_VER} src
 cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
-make install
+./configure --prefix="${PREFIX}"
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
 cd ..
 
 # Install libtool
-echo " === INSTALLING LIBTOOL =="
+echo " === INSTALLING LIBTOOL ==="
 rm -rf src
-$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/${LIBTOOL_TARBALL}" $LIBTOOL_TARBALL
-tar -zxvf $LIBTOOL_TARBALL
-rm -f $LIBTOOL_TARBALL
-mv $LIBTOOL src
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/libtool-${LIBTOOL_VER}.tar.gz" "libtool-${LIBTOOL_VER}.tar.gz"
+tar -zxvf libtool-${LIBTOOL_VER}.tar.gz
+mv libtool-${LIBTOOL_VER} src
 cd src
-./configure --prefix="$ISSM_DIR/externalpackages/autotools/install"
-make
-make install
+./configure --prefix="${PREFIX}"
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi
 cd ..
 
Index: sm/trunk-jpl/externalpackages/autotools/install.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/autotools/install.sh	(revision 25981)
+++ 	(revision )
@@ -1,69 +1,0 @@
-#!/bin/bash
-set -eu
-
-
-## Constants
-#
-AUTOCONF_VER="2.69"
-AUTOMAKE_VER="1.16.1"
-LIBTOOL_VER="2.4.2"
-M4_VER="1.4.18"
-PREFIX="${ISSM_DIR}/externalpackages/autotools/install" # Set to location where external package should be installed
-
-## Environment
-#
-export PATH="${PREFIX}/bin:$PATH"
-
-# Cleanup
-rm -rf ${PREFIX} src
-mkdir -p ${PREFIX}
-
-
-# Install m4
-echo " === INSTALLING M4 =="
-${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m4-${M4_VER}.tar.gz" "m4-${M4_VER}.tar.gz"
-tar -zxvf m4-${M4_VER}.tar.gz
-mv m4-${M4_VER} src
-cd src
-
-./configure --prefix="${PREFIX}"
-make
-make install
-cd ..
-
-# Install Autoconf
-echo " === INSTALLING AUTOCONF =="
-rm -rf src
-${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/autoconf-${AUTOCONF_VER}.tar.gz" "autoconf-${AUTOCONF_VER}.tar.gz"
-tar -zxvf autoconf-${AUTOCONF_VER}.tar.gz
-mv autoconf-${AUTOCONF_VER} src
-cd src
-./configure --prefix="${PREFIX}"
-make
-make install
-cd ..
-
-# Install Automake
-echo " === INSTALLING AUTOMAKE =="
-rm -rf src
-${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/automake-${AUTOMAKE_VER}.tar.gz" "automake-${AUTOMAKE_VER}.tar.gz"
-tar -zxvf automake-${AUTOMAKE_VER}.tar.gz
-mv automake-${AUTOMAKE_VER} src
-cd src
-./configure --prefix="${PREFIX}"
-make
-make install
-cd ..
-
-# Install libtool
-echo " === INSTALLING LIBTOOL =="
-rm -rf src
-${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/libtool-${LIBTOOL_VER}.tar.gz" "libtool-${LIBTOOL_VER}.tar.gz"
-tar -zxvf libtool-${LIBTOOL_VER}.tar.gz
-rm libtool-${LIBTOOL_VER}.tar.gz
-mv libtool-${LIBTOOL_VER} src
-cd src
-./configure --prefix="${PREFIX}"
-make
-make install
-cd ..
Index: /issm/trunk-jpl/jenkins/linux64_caladan_ad
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan_ad	(revision 25981)
+++ /issm/trunk-jpl/jenkins/linux64_caladan_ad	(revision 25982)
@@ -31,5 +31,5 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="
-	autotools	install.sh
+	autotools	install-linux.sh
 	cmake		install.sh
 	mpich		install-3.2-linux64.sh
Index: /issm/trunk-jpl/jenkins/linux64_caladan_ampi
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan_ampi	(revision 25981)
+++ /issm/trunk-jpl/jenkins/linux64_caladan_ampi	(revision 25982)
@@ -40,5 +40,5 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="
-	autotools		install.sh
+	autotools		install-linux.sh
 	cmake			install.sh
 	mpich			install-3.2-linux64.sh
Index: /issm/trunk-jpl/jenkins/pine_island-mac-adolc-ampion
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-adolc-ampion	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-adolc-ampion	(revision 25982)
@@ -40,5 +40,5 @@
 #
 EXTERNALPACKAGES="
-	autotools		install.sh
+	autotools		install-mac.sh
 	cmake			install.sh
 	petsc			install-3.12-mac.sh
Index: /issm/trunk-jpl/jenkins/pine_island-mac-basic
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-basic	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-basic	(revision 25982)
@@ -32,5 +32,5 @@
 # List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="
-	autotools	install.sh
+	autotools	install-mac.sh
 	cmake		install.sh
 	petsc		install-3.12-mac.sh
Index: /issm/trunk-jpl/jenkins/pine_island-mac-binaries-matlab
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-binaries-matlab	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-binaries-matlab	(revision 25982)
@@ -42,5 +42,5 @@
 
 EXTERNALPACKAGES="
-	autotools	install.sh
+	autotools	install-mac.sh
 	cmake		install.sh
 	petsc		install-3.12-mac-static.sh
Index: /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-binaries-python	(revision 25982)
@@ -40,5 +40,5 @@
 
 EXTERNALPACKAGES="
-	autotools	install.sh
+	autotools	install-mac.sh
 	cmake		install.sh
 	petsc		install-3.12-mac-static.sh
Index: /issm/trunk-jpl/jenkins/pine_island-mac-dakota
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-dakota	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-dakota	(revision 25982)
@@ -38,22 +38,22 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="
-	autotools		install.sh
-	cmake			install.sh
-	petsc			install-3.12-mac.sh
-	gsl				install.sh
-	boost			install-1.7-mac.sh
-	dakota			install-6.2-mac.sh
-	curl			install-7-mac.sh
-	netcdf			install-4.7-parallel.sh
-	proj			install-6.2.sh
-	gdal			install-3-python.sh
-	gshhg			install.sh
-	gmt				install-6-mac.sh
-	gmsh			install-4.sh
-	triangle		install-mac.sh
-	chaco			install.sh
-	m1qn3			install.sh
-	semic			install.sh
-	shell2junit		install.sh
+	autotools	install-mac.sh
+	cmake		install.sh
+	petsc		install-3.12-mac.sh
+	gsl			install.sh
+	boost		install-1.7-mac.sh
+	dakota		install-6.2-mac.sh
+	curl		install-7-mac.sh
+	netcdf		install-4.7-parallel.sh
+	proj		install-6.2.sh
+	gdal		install-3-python.sh
+	gshhg		install.sh
+	gmt			install-6-mac.sh
+	gmsh		install-4.sh
+	triangle	install-mac.sh
+	chaco		install.sh
+	m1qn3		install.sh
+	semic		install.sh
+	shell2junit	install.sh
 "
 
Index: /issm/trunk-jpl/jenkins/pine_island-mac-examples
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-examples	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-examples	(revision 25982)
@@ -39,5 +39,5 @@
 
 EXTERNALPACKAGES="
-	autotools	install.sh
+	autotools	install-mac.sh
 	cmake		install.sh
 	petsc		install-3.12-mac.sh
Index: /issm/trunk-jpl/jenkins/pine_island-mac-full
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-full	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-full	(revision 25982)
@@ -40,5 +40,5 @@
 
 EXTERNALPACKAGES="
-	autotools	install.sh
+	autotools	install-mac.sh
 	cmake		install.sh
 	petsc		install-3.12-mac.sh
Index: /issm/trunk-jpl/jenkins/pine_island-mac-full-valgrind
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-full-valgrind	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-full-valgrind	(revision 25982)
@@ -40,5 +40,5 @@
 
 EXTERNALPACKAGES="
-	autotools	install.sh
+	autotools	install-mac.sh
 	cmake		install.sh
 	petsc		install-3.12-mac.sh
Index: /issm/trunk-jpl/jenkins/pine_island-mac-python
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-python	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-python	(revision 25982)
@@ -35,5 +35,5 @@
 # List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="
-	autotools	install.sh
+	autotools	install-mac.sh
 	cmake		install.sh
 	petsc		install-3.12-mac.sh
Index: /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth	(revision 25981)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-solid_earth	(revision 25982)
@@ -38,22 +38,22 @@
 #List of external pakages to be installed and their installation scripts
 EXTERNALPACKAGES="
-	autotools		install.sh
-	cmake			install.sh
-	petsc			install-3.12-mac.sh
-	gsl				install.sh
-	boost			install-1.7-mac.sh
-	dakota			install-6.2-mac.sh
-	curl			install-7-mac.sh
-	netcdf			install-4.7-parallel.sh
-	proj			install-6.2.sh
-	gdal			install-3-python.sh
-	gshhg			install.sh
-	gmt				install-6-mac.sh
-	gmsh			install-4.sh
-	triangle		install-mac.sh
-	chaco			install.sh
-	m1qn3			install.sh
-	semic			install.sh
-	shell2junit		install.sh
+	autotools	install-mac.sh
+	cmake		install.sh
+	petsc		install-3.12-mac.sh
+	gsl			install.sh
+	boost		install-1.7-mac.sh
+	dakota		install-6.2-mac.sh
+	curl		install-7-mac.sh
+	netcdf		install-4.7-parallel.sh
+	proj		install-6.2.sh
+	gdal		install-3-python.sh
+	gshhg		install.sh
+	gmt			install-6-mac.sh
+	gmsh		install-4.sh
+	triangle	install-mac.sh
+	chaco		install.sh
+	m1qn3		install.sh
+	semic		install.sh
+	shell2junit	install.sh
 "