From 5d15a132472a9f6c05124cbaa2d5c66ffa0a9a11 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 7 Apr 2017 08:17:43 +0200
Subject: [PATCH] STYLE: use FOAM_UTILITIES in Make/options

- consistent with use of FOAM_SOLVERS, and reduces reliance on the FOAM_APP
  env variable
---
 applications/test/vectorTools/Make/options                    | 2 +-
 .../mesh/generation/foamyMesh/foamyQuadMesh/Make/options      | 2 +-
 etc/config.csh/settings                                       | 4 ++--
 etc/config.sh/settings                                        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/applications/test/vectorTools/Make/options b/applications/test/vectorTools/Make/options
index f695987c04..32442d589d 100644
--- a/applications/test/vectorTools/Make/options
+++ b/applications/test/vectorTools/Make/options
@@ -1 +1 @@
-EXE_INC = -I$(FOAM_APP)/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools
+EXE_INC = -I$(FOAM_UTILITIES)/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
index 904dd290a9..5ead133c28 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
@@ -8,7 +8,7 @@ EXE_INC = \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
     ${c++LESSWARN} \
-    -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
+    -I$(FOAM_UTILITIES)/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
     -I../conformalVoronoi2DMesh/lnInclude \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index 29094d6f79..98442b94a1 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -178,8 +178,8 @@ setenv FOAM_ETC $WM_PROJECT_DIR/etc
 setenv FOAM_APP $WM_PROJECT_DIR/applications
 setenv FOAM_SRC $WM_PROJECT_DIR/src
 setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
-setenv FOAM_UTILITIES $FOAM_APP/utilities
-setenv FOAM_SOLVERS $FOAM_APP/solvers
+setenv FOAM_UTILITIES $WM_PROJECT_DIR/applications/utilities
+setenv FOAM_SOLVERS $WM_PROJECT_DIR/applications/solvers
 setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
 
 # Add wmake to the path - not required for runtime-only environment
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index d1e629eed5..ebc4bf435a 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -177,8 +177,8 @@ export FOAM_ETC=$WM_PROJECT_DIR/etc
 export FOAM_APP=$WM_PROJECT_DIR/applications
 export FOAM_SRC=$WM_PROJECT_DIR/src
 export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
-export FOAM_UTILITIES=$FOAM_APP/utilities
-export FOAM_SOLVERS=$FOAM_APP/solvers
+export FOAM_UTILITIES=$WM_PROJECT_DIR/applications/utilities
+export FOAM_SOLVERS=$WM_PROJECT_DIR/applications/solvers
 export FOAM_RUN=$WM_PROJECT_USER_DIR/run
 
 # Add wmake to the path - not required for runtime-only environment