From 231733bc15854c1ecba4443a618c218f72f9255f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 22 Jan 2018 16:05:19 +0100
Subject: [PATCH] STYLE: use foamEtcFile with -config option instead of
 config.sh/

---
 makeADIOS      | 2 +-
 makeCCMIO      | 2 +-
 makeCGAL       | 4 ++--
 makeFFTW       | 2 +-
 makeGcc        | 2 +-
 makeGperftools | 2 +-
 makeKAHIP      | 2 +-
 makeLLVM       | 2 +-
 makeMETIS      | 2 +-
 makeMGridGen   | 2 +-
 makeMPICH      | 2 +-
 makeMesa       | 2 +-
 makeOPENMPI    | 2 +-
 makeTecio      | 2 +-
 makeVTK        | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/makeADIOS b/makeADIOS
index 65a4d83..bd0ca9f 100755
--- a/makeADIOS
+++ b/makeADIOS
@@ -29,7 +29,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # ADIOS version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/ADIOS
+_foamEtc -config ADIOS
 
 adiosPACKAGE=${adios_version:-adios-none}
 
diff --git a/makeCCMIO b/makeCCMIO
index aaf3548..d87a56f 100755
--- a/makeCCMIO
+++ b/makeCCMIO
@@ -34,7 +34,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # libccmio version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/ccmio
+_foamEtc -config ccmio
 
 ccmioPACKAGE=${ccmio_version:-libccmio-2.6.1}
 targetType=lib  # Default is static linkage
diff --git a/makeCGAL b/makeCGAL
index 27c5d54..2cbcc8e 100755
--- a/makeCGAL
+++ b/makeCGAL
@@ -64,8 +64,8 @@ unset BOOST_ARCH_PATH CGAL_ARCH_PATH GMP_ARCH_PATH MPFR_ARCH_PATH   # Purge old
 
 # CGAL, boost and gmp/mpfr versions from OpenFOAM etc/config.sh files.
 # Get compiler first and let CGAL config override GMP and MPFR
-_foamEtc config.sh/compiler
-_foamEtc config.sh/CGAL
+_foamEtc -config compiler
+_foamEtc -config CGAL
 
 boostPACKAGE=${boost_version:-boost-system}
 gmpPACKAGE=${gmp_version:-gmp-system}
diff --git a/makeFFTW b/makeFFTW
index c9448bf..3258f72 100755
--- a/makeFFTW
+++ b/makeFFTW
@@ -44,7 +44,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # FFTW version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/FFTW
+_foamEtc -config FFTW
 
 fftwPACKAGE=${fftw_version:-fftw-system}
 
diff --git a/makeGcc b/makeGcc
index 9fa319d..b19393f 100755
--- a/makeGcc
+++ b/makeGcc
@@ -45,7 +45,7 @@ unset GMP_ARCH_PATH MPFR_ARCH_PATH                                  # Purge old
 WM_COMPILER_TYPE=ThirdParty                # Ensure we get the correct settings
 
 # Default GCC, mpfr, gmp and mpc versions from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/compiler
+_foamEtc -config compiler
 
 gmpPACKAGE=${gmp_version:-gmp-system}
 mpfrPACKAGE=${mpfr_version:-mpfr-system}
diff --git a/makeGperftools b/makeGperftools
index b5773ec..b6a551d 100755
--- a/makeGperftools
+++ b/makeGperftools
@@ -29,7 +29,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # Gperftools version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/gperftools
+_foamEtc -config gperftools
 
 gperftoolsPACKAGE=${gperftools_version:-gperftools-system}
 
diff --git a/makeKAHIP b/makeKAHIP
index e8aaaff..d04ab17 100755
--- a/makeKAHIP
+++ b/makeKAHIP
@@ -58,7 +58,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 }
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-_foamEtc config.sh/kahip
+_foamEtc -config kahip
 
 kahipPACKAGE=${KAHIP_VERSION:-kahip-system}
 targetType=libso
diff --git a/makeLLVM b/makeLLVM
index c100259..889c917 100755
--- a/makeLLVM
+++ b/makeLLVM
@@ -50,7 +50,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 WM_COMPILER_TYPE=ThirdParty                # Ensure we get the correct settings
 
 # LLVM/Clang version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/compiler
+_foamEtc -config compiler
 
 llvmPACKAGE=$clang_version
 
diff --git a/makeMETIS b/makeMETIS
index c028cf2..81ca853 100755
--- a/makeMETIS
+++ b/makeMETIS
@@ -58,7 +58,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 }
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-_foamEtc config.sh/metis
+_foamEtc -config metis
 
 metisPACKAGE=${METIS_VERSION:-metis-system}
 targetType=libso
diff --git a/makeMGridGen b/makeMGridGen
index 30c3a79..30977f8 100755
--- a/makeMGridGen
+++ b/makeMGridGen
@@ -30,7 +30,7 @@ wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
 #------------------------------------------------------------------------------
 
 # mgridgen version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/mgridgen
+_foamEtc -config mgridgen
 
 mgridgenPACKAGE=${MGRIDGEN_VERSION:-mgridgen-none}
 
diff --git a/makeMPICH b/makeMPICH
index 2067524..9ad6d6f 100755
--- a/makeMPICH
+++ b/makeMPICH
@@ -55,7 +55,7 @@ _foamAddPath() { true; }
 WM_MPLIB=MPICH                                  # Ensure we get the correct MPI
 
 # mpich version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/mpi
+_foamEtc -config mpi
 
 mpiPACKAGE=${FOAM_MPI:-mpich-system}
 
diff --git a/makeMesa b/makeMesa
index cf97154..4535ff3 100755
--- a/makeMesa
+++ b/makeMesa
@@ -37,7 +37,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 unset vtk_version mesa_version                           # Purge current values
 
 # mesa version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/vtk
+_foamEtc -config vtk
 
 mesaPACKAGE=$mesa_version
 
diff --git a/makeOPENMPI b/makeOPENMPI
index 0862b91..95ebb87 100755
--- a/makeOPENMPI
+++ b/makeOPENMPI
@@ -55,7 +55,7 @@ _foamAddPath() { true; }
 WM_MPLIB=OPENMPI                                # Ensure we get the correct MPI
 
 # openmpi version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/mpi
+_foamEtc -config mpi
 
 mpiPACKAGE=${FOAM_MPI:-openmpi-system}
 
diff --git a/makeTecio b/makeTecio
index 743e878..f98f40c 100755
--- a/makeTecio
+++ b/makeTecio
@@ -34,7 +34,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # Boost version (headers only) from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/CGAL
+_foamEtc -config CGAL
 
 boostPACKAGE=${boost_version:-boost-system}
 tecioPACKAGE=tecio
diff --git a/makeVTK b/makeVTK
index 2adf637..69e789f 100755
--- a/makeVTK
+++ b/makeVTK
@@ -40,7 +40,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 unset vtk_version mesa_version                           # Purge current values
 
 # vtk version from OpenFOAM etc/config.sh file:
-_foamEtc config.sh/vtk
+_foamEtc -config vtk
 
 VTK_VERSION="${vtk_version##*-}"               # Without prefix