Index: /issm/trunk-jpl/externalpackages/m1qn3/configs/linux/configure.make
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/configs/linux/configure.make	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/configs/linux/configure.make	(revision 28079)
@@ -0,0 +1,2 @@
+STATIC_LIB_EXT=a
+SHARED_LIB_EXT=so
Index: /issm/trunk-jpl/externalpackages/m1qn3/configs/mac/configure.make
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/configs/mac/configure.make	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/configs/mac/configure.make	(revision 28079)
@@ -0,0 +1,2 @@
+STATIC_LIB_EXT=a
+SHARED_LIB_EXT=dylib
Index: /issm/trunk-jpl/externalpackages/m1qn3/configs/makefile
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/configs/makefile	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/configs/makefile	(revision 28079)
@@ -0,0 +1,29 @@
+include ./configure.make
+
+OBJECTS=${LIBNAME}.o
+SOURCES=${LIBNAME}.f
+
+objects: $(OBJECTS)
+
+shared: lib${LIBNAME}.$(SHARED_LIB_EXT)
+
+static: lib${LIBNAME}.$(STATIC_LIB_EXT)
+
+${LIBNAME}.o: $(SOURCES)
+	${FC} ${FFLAGS} -fpic -c $< -o $@
+
+lib${LIBNAME}.a: $(OBJECTS)
+	$(AR) -cr $@ $(OBJECTS)
+	$(RANLIB) $@
+
+lib${LIBNAME}.dll: $(OBJECTS)
+	${FC} ${FFLAGS} -shared -c $(SOURCES) -o $@
+
+lib${LIBNAME}.dylib: $(OBJECTS)
+	${FC} ${FFLAGS} -dynamiclib -install_name ${PREFIX}/lib/$@ -c $(SOURCES) -o $@
+
+lib${LIBNAME}.so: $(OBJECTS)
+	${FC} ${FFLAGS} -shared -c $(SOURCES) -o $@
+
+clean: 
+	rm -rf *.o *.$(SHARED_LIB_EXT) *.$(STATIC_LIB_EXT)
Index: /issm/trunk-jpl/externalpackages/m1qn3/configs/win/msys2/mingw64/configure.make
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/configs/win/msys2/mingw64/configure.make	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/configs/win/msys2/mingw64/configure.make	(revision 28079)
@@ -0,0 +1,2 @@
+STATIC_LIB_EXT=a
+SHARED_LIB_EXT=dll
Index: /issm/trunk-jpl/externalpackages/m1qn3/install-linux-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/install-linux-static.sh	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/install-linux-static.sh	(revision 28079)
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -eu
+
+## Constants
+#
+VER=3.3
+
+PREFIX="${ISSM_DIR}/externalpackages/m1qn3/install" # Set to location where external package should be installed
+
+# Cleanup
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX} src
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m1qn3-${VER}-distrib.tgz" "m1qn3-${VER}-distrib.tgz"
+
+# Unpack source
+tar -xzf m1qn3-${VER}-distrib.tgz
+
+# Move source to 'src' directory
+mv m1qn3-${VER}-distrib/* src
+rm -rf m1qn3-${VER}-distrib
+
+# Apply patches to src
+patch src/src/m1qn3.f patch/m1qn3.f.patch
+
+# Compile and install
+if which ifort >/dev/null; then
+	export FC="ifort"
+	export FFLAGS="-traceback -check all" # -O2 is default
+else
+	export FC="gfortran"
+	if [ `uname` == "Darwin" ]; then
+		FFLAGS="-arch $(uname -m)"
+	else
+		FFLAGS=""
+	fi
+
+	export FFLAGS
+fi
+
+cd src/src
+cp ../../configs/makefile .
+cp ../../configs/linux/configure.make .
+export LIBNAME="m1qn3"
+make static
+cp lib${LIBNAME}.* ${PREFIX}
+
+cd ../blas
+cp ../../configs/makefile .
+cp ../../configs/linux/configure.make .
+export LIBNAME="ddot"
+make static
+cp lib${LIBNAME}.* ${PREFIX}
Index: /issm/trunk-jpl/externalpackages/m1qn3/install-linux.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/install-linux.sh	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/install-linux.sh	(revision 28079)
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -eu
+
+## Constants
+#
+VER=3.3
+
+PREFIX="${ISSM_DIR}/externalpackages/m1qn3/install" # Set to location where external package should be installed
+
+# Cleanup
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX} src
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m1qn3-${VER}-distrib.tgz" "m1qn3-${VER}-distrib.tgz"
+
+# Unpack source
+tar -xzf m1qn3-${VER}-distrib.tgz
+
+# Move source to 'src' directory
+mv m1qn3-${VER}-distrib/* src
+rm -rf m1qn3-${VER}-distrib
+
+# Apply patches to src
+patch src/src/m1qn3.f patch/m1qn3.f.patch
+
+# Compile and install
+if which ifort >/dev/null; then
+	export FC="ifort"
+	export FFLAGS="-traceback -check all" # -O2 is default
+else
+	export FC="gfortran"
+	if [ `uname` == "Darwin" ]; then
+		FFLAGS="-arch $(uname -m)"
+	else
+		FFLAGS=""
+	fi
+
+	export FFLAGS
+fi
+
+cd src/src
+cp ../../configs/makefile .
+cp ../../configs/linux/configure.make .
+export LIBNAME="m1qn3"
+make shared
+cp lib${LIBNAME}.* ${PREFIX}
+
+cd ../blas
+cp ../../configs/makefile .
+cp ../../configs/linux/configure.make .
+export LIBNAME="ddot"
+make shared
+cp lib${LIBNAME}.* ${PREFIX}
Index: /issm/trunk-jpl/externalpackages/m1qn3/install-mac-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/install-mac-static.sh	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/install-mac-static.sh	(revision 28079)
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -eu
+
+## Constants
+#
+VER=3.3
+
+PREFIX="${ISSM_DIR}/externalpackages/m1qn3/install" # Set to location where external package should be installed
+
+# Cleanup
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX} src
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m1qn3-${VER}-distrib.tgz" "m1qn3-${VER}-distrib.tgz"
+
+# Unpack source
+tar -xzf m1qn3-${VER}-distrib.tgz
+
+# Move source to 'src' directory
+mv m1qn3-${VER}-distrib/* src
+rm -rf m1qn3-${VER}-distrib
+
+# Apply patches to src
+patch src/src/m1qn3.f patch/m1qn3.f.patch
+
+# Compile and install
+if which ifort >/dev/null; then
+	export FC="ifort"
+	export FFLAGS="-traceback -check all" # -O2 is default
+else
+	export FC="gfortran"
+	if [ `uname` == "Darwin" ]; then
+		FFLAGS="-arch $(uname -m)"
+	else
+		FFLAGS=""
+	fi
+
+	export FFLAGS
+fi
+
+cd src/src
+cp ../../configs/makefile .
+cp ../../configs/mac/configure.make .
+export LIBNAME="m1qn3"
+make static
+cp lib${LIBNAME}.* ${PREFIX}
+
+cd ../blas
+cp ../../configs/makefile .
+cp ../../configs/mac/configure.make .
+export LIBNAME="ddot"
+make static
+cp lib${LIBNAME}.* ${PREFIX}
Index: /issm/trunk-jpl/externalpackages/m1qn3/install-mac.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/install-mac.sh	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/install-mac.sh	(revision 28079)
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -eu
+
+## Constants
+#
+VER=3.3
+
+PREFIX="${ISSM_DIR}/externalpackages/m1qn3/install" # Set to location where external package should be installed
+
+# Cleanup
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX} src
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m1qn3-${VER}-distrib.tgz" "m1qn3-${VER}-distrib.tgz"
+
+# Unpack source
+tar -xzf m1qn3-${VER}-distrib.tgz
+
+# Move source to 'src' directory
+mv m1qn3-${VER}-distrib/* src
+rm -rf m1qn3-${VER}-distrib
+
+# Apply patches to src
+patch src/src/m1qn3.f patch/m1qn3.f.patch
+
+# Compile and install
+if which ifort >/dev/null; then
+	export FC="ifort"
+	export FFLAGS="-traceback -check all" # -O2 is default
+else
+	export FC="gfortran"
+	if [ `uname` == "Darwin" ]; then
+		FFLAGS="-arch $(uname -m)"
+	else
+		FFLAGS=""
+	fi
+
+	export FFLAGS
+fi
+
+cd src/src
+cp ../../configs/makefile .
+cp ../../configs/mac/configure.make .
+export LIBNAME="m1qn3"
+make shared
+cp lib${LIBNAME}.* ${PREFIX}
+
+cd ../blas
+cp ../../configs/makefile .
+cp ../../configs/mac/configure.make .
+export LIBNAME="ddot"
+make shared
+cp lib${LIBNAME}.* ${PREFIX}
Index: sm/trunk-jpl/externalpackages/m1qn3/install-macosx64-snowleopard.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/install-macosx64-snowleopard.sh	(revision 28078)
+++ 	(revision )
@@ -1,55 +1,0 @@
-#!/bin/bash
-set -eu
-
-#Some cleanup 
-rm -rf install src m1qn3-3.3-distrib
-mkdir install
-
-#Download from ISSM server
-$ISSM_DIR/scripts/DownloadExternalPackage.sh 'https://issm.ess.uci.edu/files/externalpackages/m1qn3-3.3-distrib.tgz' 'm1qn3-3.3-distrib.tgz'
-
-#Untar 
-tar -xzf m1qn3-3.3-distrib.tgz
-mv m1qn3-3.3-distrib src
-
-FC="gfortran"
-
-#Compile m1qn3
-cd src/src/
-(
-cat << EOF
-LIB_EXT=a
-FC=$FC
-install: libm1qn3.\$(LIB_EXT)
-	cp libm1qn3.\$(LIB_EXT) ../../install/
-OBJECTS= m1qn3.o
-libm1qn3.\$(LIB_EXT): \$(OBJECTS)
-	ar -r libm1qn3.\$(LIB_EXT) \$(OBJECTS) 
-	ranlib libm1qn3.\$(LIB_EXT) 
-%.o: %.f
-	\$(FC) \$(FFLAGS) -fPIC -c $< -o \$@
-clean: 
-	rm -rf *.o *.\$(LIB_EXT)
-EOF
-) > Makefile
-make
-
-#compile ddot
-cd ../blas
-(
-cat << EOF
-LIB_EXT=a
-FC=$FC
-install: libddot.\$(LIB_EXT)
-	cp libddot.\$(LIB_EXT) ../../install/
-OBJECTS= ddot.o
-libddot.\$(LIB_EXT): \$(OBJECTS)
-	ar -r libddot.\$(LIB_EXT) \$(OBJECTS) 
-	ranlib libddot.\$(LIB_EXT) 
-%.o: %.f
-	\$(FC) \$(FFLAGS) -fPIC -c $< -o \$@
-clean: 
-	rm -rf *.o *.\$(LIB_EXT)
-EOF
-) > Makefile
-make
Index: /issm/trunk-jpl/externalpackages/m1qn3/install-win-msys2-mingw-static.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/install-win-msys2-mingw-static.sh	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/install-win-msys2-mingw-static.sh	(revision 28079)
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -eu
+
+## Constants
+#
+VER=3.3
+
+PREFIX="${ISSM_DIR}/externalpackages/m1qn3/install" # Set to location where external package should be installed
+
+# Cleanup
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX} src
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m1qn3-${VER}-distrib.tgz" "m1qn3-${VER}-distrib.tgz"
+
+# Unpack source
+tar -xzf m1qn3-${VER}-distrib.tgz
+
+# Move source to 'src' directory
+mv m1qn3-${VER}-distrib/* src
+rm -rf m1qn3-${VER}-distrib
+
+# Apply patches to src
+patch src/src/m1qn3.f patch/m1qn3.f.patch
+
+# Compile and install
+if which ifort >/dev/null; then
+	export FC="ifort"
+	export FFLAGS="-traceback -check all" # -O2 is default
+else
+	export FC="gfortran"
+	if [ `uname` == "Darwin" ]; then
+		FFLAGS="-arch $(uname -m)"
+	else
+		FFLAGS=""
+	fi
+
+	export FFLAGS
+fi
+
+cd src/src
+cp ../../configs/makefile .
+cp ../../configs/win/msys2/mingw64/configure.make .
+export LIBNAME="m1qn3"
+make static
+cp lib${LIBNAME}.* ${PREFIX}
+
+cd ../blas
+cp ../../configs/makefile .
+cp ../../configs/win/msys2/mingw64/configure.make .
+export LIBNAME="ddot"
+make static
+cp lib${LIBNAME}.* ${PREFIX}
Index: /issm/trunk-jpl/externalpackages/m1qn3/install-win-msys2-mingw.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/install-win-msys2-mingw.sh	(revision 28079)
+++ /issm/trunk-jpl/externalpackages/m1qn3/install-win-msys2-mingw.sh	(revision 28079)
@@ -0,0 +1,54 @@
+#!/bin/bash
+set -eu
+
+## Constants
+#
+VER=3.3
+
+PREFIX="${ISSM_DIR}/externalpackages/m1qn3/install" # Set to location where external package should be installed
+
+# Cleanup
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX} src
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m1qn3-${VER}-distrib.tgz" "m1qn3-${VER}-distrib.tgz"
+
+# Unpack source
+tar -xzf m1qn3-${VER}-distrib.tgz
+
+# Move source to 'src' directory
+mv m1qn3-${VER}-distrib/* src
+rm -rf m1qn3-${VER}-distrib
+
+# Apply patches to src
+patch src/src/m1qn3.f patch/m1qn3.f.patch
+
+# Compile and install
+if which ifort >/dev/null; then
+	export FC="ifort"
+	export FFLAGS="-traceback -check all" # -O2 is default
+else
+	export FC="gfortran"
+	if [ `uname` == "Darwin" ]; then
+		FFLAGS="-arch $(uname -m)"
+	else
+		FFLAGS=""
+	fi
+
+	export FFLAGS
+fi
+
+cd src/src
+cp ../../configs/makefile .
+cp ../../configs/win/msys2/mingw64/configure.make .
+export LIBNAME="m1qn3"
+make shared
+cp lib${LIBNAME}.* ${PREFIX}
+
+cd ../blas
+cp ../../configs/makefile .
+cp ../../configs/win/msys2/mingw64/configure.make .
+export LIBNAME="ddot"
+make shared
+cp lib${LIBNAME}.* ${PREFIX}
Index: sm/trunk-jpl/externalpackages/m1qn3/install.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/m1qn3/install.sh	(revision 28078)
+++ 	(revision )
@@ -1,78 +1,0 @@
-#!/bin/bash
-set -eu
-
-## Constants
-#
-VER=3.3
-
-PREFIX="${ISSM_EXT_DIR}/m1qn3/install" # Set to location where external package should be installed
-
-# Cleanup
-rm -rf ${PREFIX} src
-mkdir -p ${PREFIX} src
-
-# Download source
-$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/m1qn3-${VER}-distrib.tgz" "m1qn3-${VER}-distrib.tgz"
-
-# Unpack source
-tar -xzf m1qn3-${VER}-distrib.tgz
-
-# Move source to 'src' directory
-mv m1qn3-${VER}-distrib/* src
-rm -rf m1qn3-${VER}-distrib
-
-# Apply patches to src
-patch src/src/m1qn3.f patch/m1qn3.f.patch
-
-if which ifort >/dev/null; then
-	FC="ifort"
-	FFLAGS="-traceback -check all" # -O2 is default 
-else
-	FC="gfortran"
-	if [ `uname` == "Darwin" ]; then
-		FFLAGS="-arch $(uname -m)"
-	else
-		FFLAGS=""
-	fi
-fi
-
-# Compile and install
-cd src/src/
-(
-cat << EOF
-LIB_EXT=a
-FC=$FC
-FFLAGS=$FFLAGS
-install: libm1qn3.\$(LIB_EXT)
-	cp libm1qn3.\$(LIB_EXT) ${PREFIX}
-OBJECTS= m1qn3.o
-libm1qn3.\$(LIB_EXT): \$(OBJECTS)
-	ar -r libm1qn3.\$(LIB_EXT) \$(OBJECTS) 
-	ranlib libm1qn3.\$(LIB_EXT) 
-%.o: %.f
-	\$(FC) \$(FFLAGS) -fPIC -c $< -o \$@
-clean: 
-	rm -rf *.o *.\$(LIB_EXT)
-EOF
-) > Makefile
-make
-
-cd ../blas
-(
-cat << EOF
-LIB_EXT=a
-FC=$FC
-FFLAGS=$FFLAGS
-install: libddot.\$(LIB_EXT)
-	cp libddot.\$(LIB_EXT) ${PREFIX}
-OBJECTS= ddot.o
-libddot.\$(LIB_EXT): \$(OBJECTS)
-	ar -r libddot.\$(LIB_EXT) \$(OBJECTS) 
-	ranlib libddot.\$(LIB_EXT) 
-%.o: %.f
-	\$(FC) \$(FFLAGS) -fPIC -c $< -o \$@
-clean: 
-	rm -rf *.o *.\$(LIB_EXT)
-EOF
-) > Makefile
-make
Index: /issm/trunk-jpl/externalpackages/triangle/configs/javascript/configure.make
===================================================================
--- /issm/trunk-jpl/externalpackages/triangle/configs/javascript/configure.make	(revision 28078)
+++ /issm/trunk-jpl/externalpackages/triangle/configs/javascript/configure.make	(revision 28079)
@@ -1,5 +1,4 @@
 CXX=em++
-CXXSWITCHES = $(CFLAGS) -DNO_TIMER -fPIC -DANSI_DECLARATORS -DTRILIBRARY 
-TRILIBDEFS = -DTRILIBRARY -DANSI_DECLARATORS
-OBJ_EXT=o
+CXXSWITCHES=$(CFLAGS) -DNO_TIMER -fPIC -DANSI_DECLARATORS -DTRILIBRARY 
+TRILIBDEFS=-DTRILIBRARY -DANSI_DECLARATORS
 LIB_EXT=a
Index: /issm/trunk-jpl/externalpackages/triangle/configs/javascript/makefile
===================================================================
--- /issm/trunk-jpl/externalpackages/triangle/configs/javascript/makefile	(revision 28078)
+++ /issm/trunk-jpl/externalpackages/triangle/configs/javascript/makefile	(revision 28079)
@@ -20,5 +20,5 @@
 all: triangle.$(LIB_EXT)
 
-OBJECTS=triangle.$(OBJ_EXT)
+OBJECTS=triangle.o
 
 triangle.$(LIB_EXT): $(OBJECTS)
@@ -26,7 +26,7 @@
 	$(RANLIB) triangle.$(LIB_EXT)
 
-triangle.$(OBJ_EXT): triangle.c triangle.h
+triangle.o: triangle.c triangle.h
 	$(CXX) $(CXXSWITCHES) $(TRILIBDEFS) -c triangle.c
 
 clean: 
-	rm -rf *.$(LIB_EXT) *.$(OBJ_EXT) *.LIB *.LST *.$(OBJ_EXT)bj *.BAK
+	rm -rf *.$(LIB_EXT) *.o *.LIB *.LST *.obj *.BAK
Index: /issm/trunk-jpl/externalpackages/triangle/configs/linux/configure.make
===================================================================
--- /issm/trunk-jpl/externalpackages/triangle/configs/linux/configure.make	(revision 28078)
+++ /issm/trunk-jpl/externalpackages/triangle/configs/linux/configure.make	(revision 28079)
@@ -4,3 +4,2 @@
 STATIC_LIB_EXT=a
 SHARED_LIB_EXT=so
-OBJ_EXT=o
Index: /issm/trunk-jpl/externalpackages/triangle/configs/mac/configure.make
===================================================================
--- /issm/trunk-jpl/externalpackages/triangle/configs/mac/configure.make	(revision 28078)
+++ /issm/trunk-jpl/externalpackages/triangle/configs/mac/configure.make	(revision 28079)
@@ -4,3 +4,2 @@
 STATIC_LIB_EXT=a
 SHARED_LIB_EXT=dylib
-OBJ_EXT=o
Index: /issm/trunk-jpl/externalpackages/triangle/configs/makefile
===================================================================
--- /issm/trunk-jpl/externalpackages/triangle/configs/makefile	(revision 28078)
+++ /issm/trunk-jpl/externalpackages/triangle/configs/makefile	(revision 28079)
@@ -13,6 +13,8 @@
 endif
 
+CSWITCHES=$(CFLAGS) -DNO_TIMER -fpic
+OBJECTS=triangle.o
 SOURCES=triangle.c triangle.h
-OBJECTS=triangle.$(OBJ_EXT)
+TRILIBDEFS=-DTRILIBRARY
 
 all: libtriangle.$(STATIC_LIB_EXT) libtriangle.$(SHARED_LIB_EXT)
@@ -24,5 +26,5 @@
 static: libtriangle.$(STATIC_LIB_EXT)
 
-triangle.$(OBJ_EXT): $(SOURCES)
+triangle.o: $(SOURCES)
 	$(CC) $(CSWITCHES) $(TRILIBDEFS) -c triangle.c
 
@@ -44,3 +46,3 @@
 
 clean:
-	rm -rf *.$(LIB_EXT) *.$(OBJ_EXT) *.LIB *.LST *.$(OBJ_EXT)bj *.BAK
+	rm -rf *.$(LIB_EXT) *.o *.LIB *.LST *.obj *.BAK
Index: /issm/trunk-jpl/externalpackages/triangle/configs/pleiades/configure.make
===================================================================
--- /issm/trunk-jpl/externalpackages/triangle/configs/pleiades/configure.make	(revision 28078)
+++ /issm/trunk-jpl/externalpackages/triangle/configs/pleiades/configure.make	(revision 28079)
@@ -1,4 +1,5 @@
 CC=gcc
-CSWITCHES = $(CFLAGS) -DNO_TIMER -DLINUX -fPIC
-OBJ_EXT=o
-LIB_EXT=a
+CSWITCHES= $(CFLAGS) -DNO_TIMER -DLINUX -fpic
+TRILIBDEFS= -DTRILIBRARY
+STATIC_LIB_EXT=a
+SHARED_LIB_EXT=so
Index: /issm/trunk-jpl/externalpackages/triangle/configs/win/msys2/gcc/configure.make
===================================================================
--- /issm/trunk-jpl/externalpackages/triangle/configs/win/msys2/gcc/configure.make	(revision 28078)
+++ /issm/trunk-jpl/externalpackages/triangle/configs/win/msys2/gcc/configure.make	(revision 28079)
@@ -1,5 +1,5 @@
 CC=gcc
-CSWITCHES=$(CFLAGS) -DNO_TIMER -fpic
-TRILIBDEFS=-DTRILIBRARY
+CSWITCHES= $(CFLAGS) -DNO_TIMER -fpic
+TRILIBDEFS= -DTRILIBRARY
 STATIC_LIB_EXT=a
 SHARED_LIB_EXT=dll
Index: /issm/trunk-jpl/externalpackages/triangle/configs/win/msys2/mingw64/configure.make
===================================================================
--- /issm/trunk-jpl/externalpackages/triangle/configs/win/msys2/mingw64/configure.make	(revision 28078)
+++ /issm/trunk-jpl/externalpackages/triangle/configs/win/msys2/mingw64/configure.make	(revision 28079)
@@ -1,6 +1,5 @@
 CC=gcc
-CSWITCHES=$(CFLAGS) -DNO_TIMER -fpic
-TRILIBDEFS=-DTRILIBRARY
+CSWITCHES= $(CFLAGS) -DNO_TIMER -fpic
+TRILIBDEFS= -DTRILIBRARY
 STATIC_LIB_EXT=a
 SHARED_LIB_EXT=dll
-OBJ_EXT=o
Index: /issm/trunk-jpl/jenkins/aws-amazon_linux-solid_earth
===================================================================
--- /issm/trunk-jpl/jenkins/aws-amazon_linux-solid_earth	(revision 28078)
+++ /issm/trunk-jpl/jenkins/aws-amazon_linux-solid_earth	(revision 28079)
@@ -46,5 +46,5 @@
 	gmsh			install-4-linux.sh
 	triangle		install-linux.sh
-	m1qn3			install.sh
+	m1qn3			install-linux.sh
 	semic			install.sh
 	shell2junit		install.sh
Index: /issm/trunk-jpl/jenkins/eis-daskhub-python-modules
===================================================================
--- /issm/trunk-jpl/jenkins/eis-daskhub-python-modules	(revision 28078)
+++ /issm/trunk-jpl/jenkins/eis-daskhub-python-modules	(revision 28079)
@@ -55,5 +55,5 @@
 	gmsh		install-4-linux.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 "
Index: /issm/trunk-jpl/jenkins/eis-smce-binaries
===================================================================
--- /issm/trunk-jpl/jenkins/eis-smce-binaries	(revision 28078)
+++ /issm/trunk-jpl/jenkins/eis-smce-binaries	(revision 28079)
@@ -54,5 +54,5 @@
 	gmsh		install-4.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 "
Index: /issm/trunk-jpl/jenkins/ghub-workspace_10
===================================================================
--- /issm/trunk-jpl/jenkins/ghub-workspace_10	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ghub-workspace_10	(revision 28079)
@@ -58,5 +58,5 @@
 	gmsh		install-4-linux.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/linux64_caladan
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan	(revision 28078)
+++ /issm/trunk-jpl/jenkins/linux64_caladan	(revision 28079)
@@ -48,5 +48,5 @@
 						dakota        install-6.2-linux64.sh
 						chaco         install-linux.sh
-						m1qn3         install.sh
+						m1qn3         install-linux.sh
 						shell2junit   install.sh"
 
Index: /issm/trunk-jpl/jenkins/mac-intel-basic
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-basic	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-intel-basic	(revision 28079)
@@ -36,5 +36,5 @@
 	petsc		install-3.14-mac.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-intel-binaries-matlab	(revision 28079)
@@ -61,5 +61,5 @@
 	gmsh		install-4-mac-static.sh
 	triangle	install-mac-static.sh
-	m1qn3		install.sh
+	m1qn3		install-mac-static.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-binaries-python-3
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-binaries-python-3	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-intel-binaries-python-3	(revision 28079)
@@ -61,5 +61,5 @@
 	gmsh		install-4-mac-static.sh
 	triangle	install-mac-static.sh
-	m1qn3		install.sh
+	m1qn3		install-mac-static.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-dakota
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-dakota	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-intel-dakota	(revision 28079)
@@ -62,5 +62,5 @@
 	gmsh		install-4-mac.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-examples
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-examples	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-intel-examples	(revision 28079)
@@ -61,5 +61,5 @@
 	gmsh		install-4-mac.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-full
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-full	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-intel-full	(revision 28079)
@@ -65,5 +65,5 @@
 	gmsh		install-4-mac.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-intel-solid_earth
===================================================================
--- /issm/trunk-jpl/jenkins/mac-intel-solid_earth	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-intel-solid_earth	(revision 28079)
@@ -65,5 +65,5 @@
 	gmsh		install-4-mac.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-basic
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-basic	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-silicon-basic	(revision 28079)
@@ -36,5 +36,5 @@
 	petsc		install-3.17-mac-silicon.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-dakota
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-dakota	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-silicon-dakota	(revision 28079)
@@ -56,5 +56,5 @@
 	gmsh		install-4-mac.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-examples
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-examples	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-silicon-examples	(revision 28079)
@@ -53,5 +53,5 @@
 	gmsh		install-4-mac.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-full
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-full	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-silicon-full	(revision 28079)
@@ -56,5 +56,5 @@
 	gmsh		install-4-mac.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/mac-silicon-solid_earth
===================================================================
--- /issm/trunk-jpl/jenkins/mac-silicon-solid_earth	(revision 28078)
+++ /issm/trunk-jpl/jenkins/mac-silicon-solid_earth	(revision 28079)
@@ -56,5 +56,5 @@
 	gmsh		install-4-mac.sh
 	triangle	install-mac.sh
-	m1qn3		install.sh
+	m1qn3		install-mac.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/pleiades-basic
===================================================================
--- /issm/trunk-jpl/jenkins/pleiades-basic	(revision 28078)
+++ /issm/trunk-jpl/jenkins/pleiades-basic	(revision 28079)
@@ -27,5 +27,5 @@
 EXTERNALPACKAGES="
 	petsc	install-3.13-pleiades.sh
-	m1qn3	install.sh
+	m1qn3	install-linux.sh
 	semic	install.sh
 "
Index: /issm/trunk-jpl/jenkins/pleiades-dakota
===================================================================
--- /issm/trunk-jpl/jenkins/pleiades-dakota	(revision 28078)
+++ /issm/trunk-jpl/jenkins/pleiades-dakota	(revision 28079)
@@ -40,5 +40,5 @@
 	dakota	install-6.2-pleiades.sh
 	chaco	install-linux.sh
-	m1qn3	install.sh
+	m1qn3	install-linux.sh
 	semic	install.sh
 "
Index: /issm/trunk-jpl/jenkins/pleiades-solid_earth
===================================================================
--- /issm/trunk-jpl/jenkins/pleiades-solid_earth	(revision 28078)
+++ /issm/trunk-jpl/jenkins/pleiades-solid_earth	(revision 28079)
@@ -54,5 +54,5 @@
 	gmsh		install-4-linux.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 "
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-basic
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-basic	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-basic	(revision 28079)
@@ -35,5 +35,5 @@
 	petsc		install-3.17-linux.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-matlab
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-matlab	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-matlab	(revision 28079)
@@ -59,5 +59,5 @@
 	gmsh		install-4-linux-static.sh
 	triangle	install-linux-static.sh
-	m1qn3		install.sh
+	m1qn3		install-linux-static.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-python-3
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-python-3	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-binaries-python-3	(revision 28079)
@@ -60,5 +60,5 @@
 	gmsh		install-4-linux-static.sh
 	triangle	install-linux-static.sh
-	m1qn3		install.sh
+	m1qn3		install-linux-static.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-codipack
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-codipack	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-codipack	(revision 28079)
@@ -42,5 +42,5 @@
 	gsl			install.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	medipack	install.sh
 	codipack	install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-dakota
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-dakota	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-dakota	(revision 28079)
@@ -58,5 +58,5 @@
 	gmsh			install-4-linux.sh
 	triangle		install-linux.sh
-	m1qn3			install.sh
+	m1qn3			install-linux.sh
 	semic			install.sh
 	shell2junit		install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-full
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-full	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-full	(revision 28079)
@@ -59,5 +59,5 @@
 	gmsh		install-4-linux.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-full-mplapack
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-full-mplapack	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-full-mplapack	(revision 28079)
@@ -59,5 +59,5 @@
 	gmsh		install-4-linux.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-full-valgrind	(revision 28079)
@@ -58,5 +58,5 @@
 	gmsh		install-4-linux.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 	valgrind	install-linux.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-iceocean	(revision 28079)
@@ -36,5 +36,5 @@
 	petsc		install-3.17-linux.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-python
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-python	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-python	(revision 28079)
@@ -53,5 +53,5 @@
 	gmsh		install-4-linux.sh
 	triangle	install-linux.sh
-	m1qn3		install.sh
+	m1qn3		install-linux.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth	(revision 28079)
@@ -56,5 +56,5 @@
 	gmsh			install-4-linux.sh
 	triangle		install-linux.sh
-	m1qn3			install.sh
+	m1qn3			install-linux.sh
 	semic			install.sh
 	shell2junit		install.sh
Index: /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic
===================================================================
--- /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic	(revision 28079)
@@ -32,5 +32,5 @@
 	petsc		install-3.14-win-msys2-mingw-msmpi.sh
 	triangle	install-win-msys2-mingw.sh
-	m1qn3		install.sh
+	m1qn3		install-win-msys2-mingw.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab
===================================================================
--- /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-binaries-matlab	(revision 28079)
@@ -33,5 +33,5 @@
 	petsc		install-3.14-win-msys2-mingw-msmpi-static.sh
 	triangle	install-win-msys2-mingw-static.sh
-	m1qn3		install.sh
+	m1qn3		install-win-msys2-mingw-static.sh
 	semic		install.sh
 	shell2junit	install.sh
Index: /issm/trunk-jpl/jenkins/ub-ccr
===================================================================
--- /issm/trunk-jpl/jenkins/ub-ccr	(revision 28078)
+++ /issm/trunk-jpl/jenkins/ub-ccr	(revision 28079)
@@ -23,5 +23,5 @@
 	--with-scalapack-dir="${ISSM_EXT_DIR}/petsc/install" \
 	--with-mumps-dir="${ISSM_EXT_DIR}/petsc/install" \
-	--with-hdf5-dir="${ISSM_EXT_DIR}//hdf5/install" \
+	--with-hdf5-dir="${ISSM_EXT_DIR}/hdf5/install" \
 	--with-petsc-dir="${ISSM_EXT_DIR}/petsc/install" \
 	--with-gsl-dir="${ISSM_EXT_DIR}/gsl/install" \
@@ -48,7 +48,6 @@
 	hdf5			install-1-parallel.sh
 	netcdf			install-4.7-parallel.sh
-	netcdf-python	install.sh
 	triangle		install-linux.sh
-	m1qn3			install.sh
+	m1qn3			install-linux.sh
 	semic			install.sh
 	shell2junit		install.sh