Index: /issm/trunk-jpl/externalpackages/adic/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/adic/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/adic/install.sh (revision 11128) @@ -26,4 +26,8 @@ --with-colpack=$ISSM_TIER/externalpackages/colpack/install\ --prefix=$ISSM_TIER/externalpackages/adic/install -make -j $1 -make -j $1 install +if [ -z $1 ]; then + make +else + make -j $1 +fi +make install Index: /issm/trunk-jpl/externalpackages/adolc/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/adolc/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/adolc/install.sh (revision 11128) @@ -21,4 +21,8 @@ --enable-docexa \ --enable-addexa -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi make install Index: /issm/trunk-jpl/externalpackages/angel/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/angel/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/angel/install.sh (revision 11128) @@ -9,3 +9,3 @@ #Compile cd angel -make -j $1 +make Index: /issm/trunk-jpl/externalpackages/chaco/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/chaco/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/chaco/install.sh (revision 11128) @@ -20,6 +20,10 @@ # Build chaco cd src/code -make -j $1 -make -j $1 chacominusblas.a +if [ -z $1 ]; then + make +else + make -j $1 +fi +make chacominusblas.a # Clean up objects (but not library or executable) Index: /issm/trunk-jpl/externalpackages/cmake/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/cmake/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/cmake/install.sh (revision 11128) @@ -15,4 +15,8 @@ cd install ./bootstrap --prefix=$ISSM_TIER/externalpackages/cmake/install -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1; +fi make install Index: /issm/trunk-jpl/externalpackages/colpack/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/colpack/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/colpack/install.sh (revision 11128) @@ -12,5 +12,9 @@ #compile cd src -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi cd .. Index: /issm/trunk-jpl/externalpackages/cppcheck/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/cppcheck/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/cppcheck/install.sh (revision 11128) @@ -12,5 +12,9 @@ #compile cd src -make -j $1 -make -j $1 install PREFIX=$ISSM_TIER/externalpackages/cppcheck/install +if [ -z $1 ]; then + make +else + make -j $1 +fi +make install PREFIX=$ISSM_TIER/externalpackages/cppcheck/install cd .. Index: /issm/trunk-jpl/externalpackages/doxygen/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/doxygen/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/doxygen/install.sh (revision 11128) @@ -20,5 +20,9 @@ #Configure doxygen cd src && ./configure --prefix "$ISSM_TIER/externalpackages/doxygen/install" -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi #Install doxygen Index: /issm/trunk-jpl/externalpackages/gdal/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/gdal/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/gdal/install.sh (revision 11128) @@ -29,4 +29,8 @@ #Compile and install gdal -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi make install Index: /issm/trunk-jpl/externalpackages/graphviz/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/graphviz/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/graphviz/install.sh (revision 11128) @@ -19,5 +19,9 @@ #Compile and install cd src -make -j $1 -make -j $1 install +if [ -z $1 ]; then + make +else + make -j $1 +fi +make install cd .. Index: /issm/trunk-jpl/externalpackages/mercurial/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mercurial/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/mercurial/install.sh (revision 11128) @@ -18,3 +18,3 @@ #Compile mercurial -make -j $1 +make Index: /issm/trunk-jpl/externalpackages/metis/install-5.0.1-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/metis/install-5.0.1-linux64.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/metis/install-5.0.1-linux64.sh (revision 11128) @@ -18,3 +18,3 @@ #Compile metis make config prefix="$ISSM_TIER/externalpackages/metis/install" -make -j $1 install +make install Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-altix64.sh (revision 11128) @@ -28,5 +28,9 @@ #Compile mpich2 -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi 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 11127) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-linux64.sh (revision 11128) @@ -28,4 +28,8 @@ #Compile mpich2 -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi 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 11127) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-macosx32.sh (revision 11128) @@ -27,5 +27,9 @@ #Compile mpich2 -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi 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 11127) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.0.2-win32.sh (revision 11128) @@ -25,5 +25,9 @@ #Compile mpich2 -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi make install Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.4-linux64.sh (revision 11128) @@ -23,5 +23,9 @@ #Compile mpich2 -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi make install Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx32.sh (revision 11128) @@ -26,5 +26,9 @@ #Compile mpich2 -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi make install Index: /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/mpich2/install-1.4-macosx64.sh (revision 11128) @@ -26,5 +26,9 @@ #Compile mpich2 -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi make install Index: /issm/trunk-jpl/externalpackages/netcdf/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/netcdf/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/netcdf/install.sh (revision 11128) @@ -16,4 +16,8 @@ cd install ./configure --prefix="$ISSM_TIER/externalpackages/netcdf/install" -make -j $NUMCPUS -make -j $NUMCPUS install +if [ -z $1 ]; then + make +else + make -j $1 +fi +make install Index: /issm/trunk-jpl/externalpackages/oofem/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/oofem/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/oofem/install.sh (revision 11128) @@ -20,5 +20,9 @@ #Compile oofem cd targets/oofem-2.0 -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi # build verification tools Index: /issm/trunk-jpl/externalpackages/pcre/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/pcre/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/pcre/install.sh (revision 11128) @@ -14,4 +14,4 @@ cd install ./configure --prefix "$ISSM_TIER/externalpackages/python/install" -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-cosmos.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-cosmos.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-cosmos.sh (revision 11128) @@ -29,4 +29,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-linux64-astrid.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-linux64-astrid.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-linux64-astrid.sh (revision 11128) @@ -32,4 +32,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-eric.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-eric.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-eric.sh (revision 11128) @@ -64,5 +64,5 @@ #Compile petsc and install it - make -j $1 + make make install fi Index: /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-macosx32-ogive.sh (revision 11128) @@ -28,4 +28,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-win32-eric.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-win32-eric.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-2.3.2-win32-eric.sh (revision 11128) @@ -22,4 +22,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.1-cosmos.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.1-cosmos.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.1-cosmos.sh (revision 11128) @@ -29,4 +29,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.1-linux64-astrid.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.1-linux64-astrid.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.1-linux64-astrid.sh (revision 11128) @@ -33,4 +33,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-mathieu.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-mathieu.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-mathieu.sh (revision 11128) @@ -32,4 +32,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-ogive.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-ogive.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.1-macosx32-ogive.sh (revision 11128) @@ -33,4 +33,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.2-linux64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.2-linux64.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.2-linux64.sh (revision 11128) @@ -34,4 +34,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/petsc/install-3.2-macosx64.sh =================================================================== --- /issm/trunk-jpl/externalpackages/petsc/install-3.2-macosx64.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/petsc/install-3.2-macosx64.sh (revision 11128) @@ -28,4 +28,4 @@ #Compile petsc and install it -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/python/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/python/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/python/install.sh (revision 11128) @@ -15,4 +15,8 @@ cd install ./configure --prefix "$ISSM_TIER/externalpackages/python/install" -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi make install Index: /issm/trunk-jpl/externalpackages/qhull/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/qhull/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/qhull/install.sh (revision 11128) @@ -16,4 +16,4 @@ cd src ./configure --prefix="$ISSM_TIER/externalpackages/qhull/install" -make -j $1 -make -j $1 install +make +make install Index: /issm/trunk-jpl/externalpackages/rats/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/rats/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/rats/install.sh (revision 11128) @@ -13,5 +13,5 @@ cd src ./configure --prefix=$ISSM_TIER/externalpackages/rats/install -make -j $1 +make make install cd .. Index: /issm/trunk-jpl/externalpackages/rose/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/rose/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/rose/install.sh (revision 11128) @@ -19,4 +19,8 @@ --srcdir=$ISSM_TIER/externalpackages/rose/source -make -j $NUMCPUS +if [ -z $1 ]; then + make +else + make -j $1 +fi make install Index: /issm/trunk-jpl/externalpackages/scotch/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/scotch/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/scotch/install.sh (revision 11128) @@ -1,6 +1,3 @@ #!/bin/bash - -#get number of CPUS -NUMCPUS=$1; # Some cleanup @@ -29,8 +26,8 @@ cd src/src # For stand-alone scotch modules: -make -j $NUMCPUS scotch +make scotch make clean # For no-file-io scotch modules: -make -j $NUMCPUS nfioscotch +make nfioscotch # Clean up make clean @@ -53,3 +50,2 @@ #cp -p gmap.m install/bin #cp -p gpart.m install/bin - Index: /issm/trunk-jpl/externalpackages/shapelib/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/shapelib/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/shapelib/install.sh (revision 11128) @@ -21,5 +21,9 @@ # Build shapelib and run self-tests cd src -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi make test Index: /issm/trunk-jpl/externalpackages/slepc/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/slepc/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/slepc/install.sh (revision 11128) @@ -15,3 +15,7 @@ cd install ./config/configure.py -make -j $1 +if [ -z $1 ]; then + make +else + make -j $1 +fi Index: /issm/trunk-jpl/externalpackages/vim/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/vim/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/vim/install.sh (revision 11128) @@ -23,4 +23,4 @@ #Compile vim -make -j $1 +make make install Index: /issm/trunk-jpl/externalpackages/xaifbooster/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/xaifbooster/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/xaifbooster/install.sh (revision 11128) @@ -9,3 +9,3 @@ #Compile xaifBooster cd xaifBooster -make -j $1 +make Index: /issm/trunk-jpl/externalpackages/xerces/install.sh =================================================================== --- /issm/trunk-jpl/externalpackages/xerces/install.sh (revision 11127) +++ /issm/trunk-jpl/externalpackages/xerces/install.sh (revision 11128) @@ -19,3 +19,3 @@ #Compile xerces-c-tools -make -j $1 +make