From c1ebcc1a7812bbaf020d50d38bdd13c0ae32665c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 31 Dec 2020 17:38:09 +0000
Subject: [PATCH] Updating conditional statements in Make/files to use
 environment variables and ifeq and ifneq

---
 src/OSspecific/POSIX/Make/files                                 | 2 +-
 src/OpenFOAM/Make/files                                         | 2 +-
 .../MGridGenGamgAgglomeration/Make/options                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OSspecific/POSIX/Make/files b/src/OSspecific/POSIX/Make/files
index f2b94eb4b6..cc491d352e 100644
--- a/src/OSspecific/POSIX/Make/files
+++ b/src/OSspecific/POSIX/Make/files
@@ -16,7 +16,7 @@ memInfo/memInfo.C
 # to use stat (=timestamps) instead of inotify
 fileMonitor.C
 
-ifdef SunOS64
+ifeq "$(WM_ARCH)" "SunOS64"
     dummyPrintStack.C
 else
     printStack.C
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 0307b1a53e..ab53484868 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -66,7 +66,7 @@ primitives/Tensor/lists/symmTensorList.C
 primitives/Tensor/lists/tensorList.C
 
 primitives/Vector/complexVector/complexVector.C
-ifndef $(WM_SP)
+ifneq "$(WM_PRECISION_OPTION)" "SP"
 primitives/Vector/floatVector/floatVector.C
 primitives/Tensor/floatTensor/floatTensor.C
 endif
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
index 343daf982d..69f63dbe57 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
@@ -1,7 +1,7 @@
 # Needs ParMGridGen environment variable set. (see Allwmake script)
 
 TYPE_REAL =
-ifndef $(WM_SP)
+ifneq "$(WM_PRECISION_OPTION)" "SP"
     TYPE_REAL = -DTYPE_REAL
 endif