Allwmake

@@ -2,10 +2,11 @@
 cd "${0%/*}" || exit                            # Run from this directory
 targetType=libso
 . "${WM_PROJECT_DIR:?}"/wmake/scripts/AllwmakeParseArguments
+
 #------------------------------------------------------------------------------
 # Build into FOAM_USER_{APPBIN,LIBBIN} unless otherwise specified with
 # -prefix or FOAM_MODULE_{APPBIN,LIBBIN} env varables
-
+#------------------------------------------------------------------------------
 moduleName="external-solver (petsc)"
 
 echo "========================================"

src/petsc4Foam/Allwclean

@@ -3,9 +3,19 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/wmake/scripts/wmakeFunctions  # The wmake functions
 # -----------------------------------------------------------------------------
 
-rm -f $FOAM_LIBBIN/libpetscFoam*                 # Cleanup library
-rm -f $FOAM_SITE_LIBBIN/libpetscFoam*            # ... extra safety
-rm -f $FOAM_USER_LIBBIN/libpetscFoam*            # ... extra safety
+# Remove library files
+# - regular and mpi-specific locations
+
+for libDir in "$FOAM_LIBBIN" "$FOAM_SITE_LIBBIN" "$FOAM_USER_LIBBIN"
+do
+    if [ -d "$libDir" ]
+    then
+        for dir in "$libDir" "$libDir/$FOAM_MPI"
+        do
+            rm -f "$dir"/libpetscFoam*
+        done
+    fi
+done
 
 # Cleanup generated files - remove entire top-level
 removeObjectDir "$PWD"

src/petsc4Foam/Allwmake

 #!/bin/sh
-cd ${0%/*} || exit 1                         # Run from this directory
+cd "${0%/*}" || exit                            # Run from this directory
 targetType=libso
 . "${WM_PROJECT_DIR:?}"/wmake/scripts/AllwmakeParseArguments
 . "${WM_PROJECT_DIR:?}"/wmake/scripts/have_petsc