ENH: support module install prefix (default to user)

Allwclean

@@ -3,8 +3,8 @@ cd ${0%/*} || exit 1                        # Run from this directory
 
 #------------------------------------------------------------------------------
 
-wclean libso meshLibrary
-wclean all executables
-wclean all utilities
+wclean meshLibrary
+wclean -all executables
+wclean -all utilities
 
 #------------------------------------------------------------------------------

Allwmake

 #!/bin/sh
 cd ${0%/*} || exit 1                        # Run from this directory
-
-# Parse arguments for library compilation
-if [ -f $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments ]
-then  . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+if [ -f "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments ]
+then  . "$WM_PROJECT_DIR"/wmake/scripts/AllwmakeParseArguments
 fi
 
 #------------------------------------------------------------------------------
@@ -12,11 +10,12 @@ date "+%Y-%m-%d %H:%M:%S %z" 2>/dev/null || echo "date is unknown"
 echo "Starting compile of cfMesh with ${WM_PROJECT_DIR##*/} ${0##*}"
 echo "  $WM_COMPILER $WM_COMPILER_TYPE compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
+echo "  prefix = ${FOAM_MODULE_PREFIX:-default (user)}"
 echo
 
 wmake libso meshLibrary
-wmake all executables
-wmake all utilities
+wmake -all executables
+wmake -all utilities
 
 # Some summary information
 echo

executables/cartesian2DMesh/Make/files

 cartesian2DMesh.C
 
-EXE = $(FOAM_APPBIN)/cartesian2DMesh
+EXE = $(FOAM_MODULE_APPBIN)/cartesian2DMesh

executables/cartesian2DMesh/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -8,5 +18,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

executables/cartesianMesh/Make/files

 cartesianMesh.C
 
-EXE = $(FOAM_APPBIN)/cartesianMesh
+EXE = $(FOAM_MODULE_APPBIN)/cartesianMesh

executables/cartesianMesh/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -8,5 +18,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

executables/pMesh/Make/files

 pMesh.C
 
-EXE = $(FOAM_APPBIN)/pMesh
+EXE = $(FOAM_MODULE_APPBIN)/pMesh

executables/pMesh/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -8,5 +18,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

executables/tetMesh/Make/files

 tetMesh.C
 
-EXE = $(FOAM_APPBIN)/tetMesh
+EXE = $(FOAM_MODULE_APPBIN)/tetMesh

executables/tetMesh/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -8,5 +18,4 @@ EXE_INC = \
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

meshLibrary/Make/files

@@ -465,4 +465,4 @@ $(writeAsFPMA)/fpmaMesh.C
 
 $(workflowControls)/workflowControls.C
 
-LIB = $(FOAM_LIBBIN)/libmeshLibrary
+LIB = $(FOAM_MODULE_LIBBIN)/libmeshLibrary

meshLibrary/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     $(COMP_OPENMP) \
     -I$(LIB_SRC)/fileFormats/lnInclude \

testingInterfaces/testAnisotropicMeshing/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -5,6 +11,5 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

testingInterfaces/testBndLayerRefinement/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -5,6 +11,5 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

testingInterfaces/testBndLayerSmoothing/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -5,6 +11,5 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

testingInterfaces/testDynList/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
+    -g -ggdb -DFULLDEBUG -O0 \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -L$(FOAM_USER_LIBBIN) -g -ggdb -DFULLDEBUG -O0 \
-    -lmeshLibrary \
-    -lmeshTools
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

testingInterfaces/testEdgeExtractorFUN/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -5,6 +11,5 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -L$(FOAM_USER_LIBBIN) \
-    -lmeshLibrary \
-    -lmeshTools
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/FLMAToSurface/Make/files

 FLMAToSurface.C
 
-EXE = $(FOAM_APPBIN)/FLMAToSurface
+EXE = $(FOAM_MODULE_APPBIN)/FLMAToSurface

utilities/FLMAToSurface/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -9,5 +19,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lsurfMesh \
     -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/FMSToSurface/Make/files

 FMSToSurface.C
 
-EXE = $(FOAM_APPBIN)/FMSToSurface
+EXE = $(FOAM_MODULE_APPBIN)/FMSToSurface

utilities/FMSToSurface/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/FMSToVTK/Make/files

 FMSToVTK.C
 
-EXE = $(FOAM_APPBIN)/FMSToVTK
+EXE = $(FOAM_MODULE_APPBIN)/FMSToVTK

utilities/FMSToVTK/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/checkSurfaceMesh/Make/files

 checkSurfaceMesh.C
 
-EXE = $(FOAM_APPBIN)/checkSurfaceMesh
+EXE = $(FOAM_MODULE_APPBIN)/checkSurfaceMesh

utilities/checkSurfaceMesh/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/copySurfaceParts/Make/files

 copySurfaceParts.C
 
-EXE = $(FOAM_APPBIN)/copySurfaceParts
+EXE = $(FOAM_MODULE_APPBIN)/copySurfaceParts

utilities/copySurfaceParts/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/extrudeEdgesInto2DSurface/Make/files

 extrudeEdgesInto2DSurface.C
 
-EXE = $(FOAM_APPBIN)/extrudeEdgesInto2DSurface
+EXE = $(FOAM_MODULE_APPBIN)/extrudeEdgesInto2DSurface

utilities/extrudeEdgesInto2DSurface/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/generateBoundaryLayers/Make/files

 generateBoundaryLayers.C
 
-EXE = $(FOAM_APPBIN)/generateBoundaryLayers
+EXE = $(FOAM_MODULE_APPBIN)/generateBoundaryLayers

utilities/generateBoundaryLayers/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/importSurfaceAsSubset/Make/files

 importSurfaceAsSubset.C
 
-EXE = $(FOAM_APPBIN)/importSurfaceAsSubset
+EXE = $(FOAM_MODULE_APPBIN)/importSurfaceAsSubset

utilities/importSurfaceAsSubset/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/improveMeshQuality/Make/files

 improveMeshQuality.C
 
-EXE = $(FOAM_APPBIN)/improveMeshQuality
+EXE = $(FOAM_MODULE_APPBIN)/improveMeshQuality

utilities/improveMeshQuality/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/improveSymmetryPlanes/Make/files

 improveSymmetryPlanes.C
 
-EXE = $(FOAM_APPBIN)/improveSymmetryPlanes
+EXE = $(FOAM_MODULE_APPBIN)/improveSymmetryPlanes

utilities/improveSymmetryPlanes/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/mergeSurfacePatches/Make/files

 mergeSurfacePatches.C
 
-EXE = $(FOAM_APPBIN)/mergeSurfacePatches
+EXE = $(FOAM_MODULE_APPBIN)/mergeSurfacePatches

utilities/mergeSurfacePatches/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -9,5 +19,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -lsurfMesh \
     -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/meshToFPMA/Make/files

 meshToFPMA.C
 
-EXE = $(FOAM_APPBIN)/meshToFPMA
+EXE = $(FOAM_MODULE_APPBIN)/meshToFPMA

utilities/meshToFPMA/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/patchesToSubsets/Make/files

 patchesToSubsets.C
 
-EXE = $(FOAM_APPBIN)/patchesToSubsets
+EXE = $(FOAM_MODULE_APPBIN)/patchesToSubsets

utilities/patchesToSubsets/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -6,6 +16,6 @@ EXE_INC = \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    -lfiniteVolume -lmeshTools \
-    -L$(FOAM_LIBBIN) \
-    -lmeshLibrary
+    -lfiniteVolume \
+    -lmeshTools \
+    -L$(FOAM_MODULE_LIBBIN) -lmeshLibrary

utilities/preparePar/Make/files

 preparePar.C
 
-EXE = $(FOAM_APPBIN)/preparePar
+EXE = $(FOAM_MODULE_APPBIN)/preparePar

utilities/preparePar/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */
+ifeq (,$(strip $(FOAM_MODULE_APPBIN)))
+    FOAM_MODULE_APPBIN = $(FOAM_USER_APPBIN)
+endif
+ifeq (,$(strip $(FOAM_MODULE_LIBBIN)))
+    FOAM_MODULE_LIBBIN = $(FOAM_USER_LIBBIN)
+endif
+
 EXE_INC = \
     -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude

utilities/removeSurfaceFacets/Make/files

 removeSurfaceFacets.C
 
-EXE = $(FOAM_APPBIN)/removeSurfaceFacets
+EXE = $(FOAM_MODULE_APPBIN)/removeSurfaceFacets

utilities/removeSurfaceFacets/Make/options

+sinclude $(GENERAL_RULES)/module-path-user
+
+/* Failsafe - user location */