diff --git a/bin/foamLog b/bin/foamLog
index facdf586078f238589e0c4174485641a6872ee48..b3beddcbb059cb4dd81e5cf9a98480a7292962d3 100755
--- a/bin/foamLog
+++ b/bin/foamLog
@@ -31,7 +31,7 @@
#------------------------------------------------------------------------------
Script=${0##*/}
toolsDir=${0%/*}/tools
-siteDir=${WM_PROJECT_SITE:-${WM_PROJECT_INST_DIR:-<unknown>}/site}
+siteDir="${WM_PROJECT_SITE:-${WM_PROJECT_DIR:-<unknown>}/site}"
userDir=$HOME/.OpenFOAM
usage() {
diff --git a/bin/foamNewCase b/bin/foamNewCase
index 2b88170dd183e6415420e263a1b6946ed9f455b4..902b082ca1db63b1a044cc05d7719c9a4a2b5585 100755
--- a/bin/foamNewCase
+++ b/bin/foamNewCase
@@ -30,9 +30,10 @@
# - requires rsync
#
#------------------------------------------------------------------------------
-siteDir=${WM_PROJECT_SITE:-${WM_PROJECT_INST_DIR:-<unknown>}/site}
-userDir=$HOME/.OpenFOAM
-version=${WM_PROJECT_VERSION:-unknown}
+siteDir="${WM_PROJECT_SITE:-${WM_PROJECT_DIR:-<unknown>}/site}"
+userDir="$HOME/.OpenFOAM"
+version="${WM_PROJECT_VERSION:-unknown}"
+
templateDir="appTemplates"
#------------------------------------------------------------------------------
diff --git a/bin/tools/change-sitedir.sh b/bin/tools/change-sitedir.sh
index 61d9c3ea8b6510b2451ccf7a07f0882ed3e2771e..220f1225d225a5ebe6fe625478995d6a22562312 100644
--- a/bin/tools/change-sitedir.sh
+++ b/bin/tools/change-sitedir.sh
@@ -42,11 +42,11 @@
# The suffix value should normally include "platforms/$WM_OPTIONS"
#
# Example
-# . /path/change-sitedir.sh -prefix -platforms
+# . /path/change-sitedir.sh -project -platforms
#
# corresponds to the standard site location:
#
-# $WM_PROJECT_INST_DIR/site{/$WM_PROJECT_VERSION/platforms/$WM_OPTIONS}
+# $WM_PROJECT_DIR/site{/$WM_PROJECT_VERSION/platforms/$WM_OPTIONS}
#
#------------------------------------------------------------------------------
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index 14215520212a9fc013099abd0a8e485673dd2484..4df1aa03b4a9f026ad03004ae04a99ff8aa5e266 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -115,9 +115,9 @@
// - ~/.OpenFOAM/
// <em>for version-independent files</em>
// -# group settings
- // - $WM_PROJECT_INST_DIR/site/\<VERSION\>
+ // - $WM_PROJECT_DIR/site/\<VERSION\>
// <em>for version-specific files</em>
- // - $WM_PROJECT_INST_DIR/site/
+ // - $WM_PROJECT_DIR/site/
// <em>for version-independent files</em>
// -# other (shipped) settings
// - $WM_PROJECT_DIR/etc/
diff --git a/etc/bashrc b/etc/bashrc
index cfb47547f91fc8adaaf69ec4c037f8a5eda03711..3f316875f50a37b3fb5e1eb54bd894093965433f 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -134,7 +134,9 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
# [WM_PROJECT_SITE] - Location of site-specific (group) files
-# default (unset) implies WM_PROJECT_INST_DIR/site
+# Default (unset) implies WM_PROJECT_DIR/site
+# Normally defined in calling environment
+
if [ -d "$WM_PROJECT_SITE" ]
then
export WM_PROJECT_SITE
diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index 4fe574cef94bc51823da0dd3baee02fc376ca9f4..be1103bd08b61584ad92c13b98aac07b10e666b4 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -154,7 +154,7 @@ setenv FOAM_EXT_LIBBIN $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRE
if ( $?WM_PROJECT_SITE ) then
set siteDir=$WM_PROJECT_SITE
else
- set siteDir=$WM_PROJECT_INST_DIR/site
+ set siteDir=$WM_PROJECT_DIR/site
endif
# Shared site (group) executables/libraries
@@ -177,7 +177,6 @@ endif
if ( -d "$siteDir/$WM_PROJECT_VERSION/bin" ) then # Version-specific
_foamAddPath "$siteDir/$WM_PROJECT_VERSION/bin"
endif
-unset siteDir
_foamAddPath ${FOAM_USER_APPBIN}:${FOAM_SITE_APPBIN}:${FOAM_APPBIN}
_foamAddLib $FOAM_LIBBIN/dummy # Dummy versions of external libraries last
@@ -333,7 +332,7 @@ endsw
# Cleanup
# ~~~~~~~
-unset archDir
+unset archDir siteDir
unset gcc_version gccDir
unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
unset clang_version clangDir
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index f1789ca4dfc0752e4eb1f777a4d71b8ea77cbc88..d2de700c3d2fa05e8cb136d8753789bef1ad4e4a 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -148,7 +148,7 @@ if [ -n "$WM_PROJECT_SITE" ]
then
siteDir=$WM_PROJECT_SITE
else
- siteDir=$WM_PROJECT_INST_DIR/site
+ siteDir=$WM_PROJECT_DIR/site
fi
# Shared site (group) executables/libraries
@@ -173,7 +173,6 @@ if [ -d "$siteDir/$WM_PROJECT_VERSION/bin" ] # Version-specific
then
_foamAddPath "$siteDir/$WM_PROJECT_VERSION/bin"
fi
-unset siteDir
_foamAddPath $FOAM_USER_APPBIN:$FOAM_SITE_APPBIN:$FOAM_APPBIN
_foamAddLib $FOAM_LIBBIN/dummy # Dummy versions of external libraries last
@@ -321,7 +320,7 @@ esac
# Cleanup
# ~~~~~~~
-unset archDir
+unset archDir siteDir
unset gcc_version gccDir
unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
unset clang_version clangDir
diff --git a/etc/cshrc b/etc/cshrc
index a8da076288cf4f681db281744d2c6f1e3989d411..56f023997263f17dc561eb715b496003861627ac 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -145,7 +145,9 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
setenv WM_PROJECT_USER_DIR "$HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION"
# [WM_PROJECT_SITE] - Location of site-specific (group) files
-# default (unset) implies WM_PROJECT_INST_DIR/site
+# Default (unset) implies WM_PROJECT_DIR/site
+# Normally defined in calling environment
+
if ( $?WM_PROJECT_SITE ) then
set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
if ( ! -d "$WM_PROJECT_SITE" ) unsetenv WM_PROJECT_SITE
diff --git a/src/OpenFOAM/global/etcFiles/etcFiles.C b/src/OpenFOAM/global/etcFiles/etcFiles.C
index 6e23b80b34d46b85e4114ceccc4a57046acaf093..9d2f28c86c6d54a72198654012bfbdcad5da6b0e 100644
--- a/src/OpenFOAM/global/etcFiles/etcFiles.C
+++ b/src/OpenFOAM/global/etcFiles/etcFiles.C
@@ -68,7 +68,7 @@ static inline bool userResourceDir(Foam::fileName& queried)
// Corresponds to foamEtcFile -mode=g
// Looks for
// - $WM_PROJECT_SITE
-// - $WM_PROJECT_INST_DIR/site
+// - $WM_PROJECT_DIR/site
static inline bool groupResourceDir(Foam::fileName& queried)
{
#ifdef FOAM_RESOURCE_SITE_ENVNAME
diff --git a/src/OpenFOAM/global/etcFiles/etcFiles.H b/src/OpenFOAM/global/etcFiles/etcFiles.H
index f88ac509bf22bdb982e1e007bdfa35fd9d7a589f..859c1010b572416f9df9b571e5d704d1b2a05805 100644
--- a/src/OpenFOAM/global/etcFiles/etcFiles.H
+++ b/src/OpenFOAM/global/etcFiles/etcFiles.H
@@ -71,7 +71,7 @@ fileNameList findEtcDirs
//
// \note Treatment of empty or undefined variables
// - \b \$WM_PROJECT_VERSION : Use compile-time value of OPENFOAM
-// - \b \$WM_PROJECT_SITE : Use $WM_PROJECT_INST_DIR/site
+// - \b \$WM_PROJECT_SITE : Use $WM_PROJECT_DIR/site
//
// \return The list of full paths of all the matching files or
// an empty list if the name cannot be found.
diff --git a/src/OpenFOAM/include/foamVersion.H b/src/OpenFOAM/include/foamVersion.H
index 37df0a8377c1fb0617870f3b94c323c44b28764d..90e3d5dd31627afbdb0b2cbec9c5f2bea95668d0 100644
--- a/src/OpenFOAM/include/foamVersion.H
+++ b/src/OpenFOAM/include/foamVersion.H
@@ -66,14 +66,9 @@ SourceFiles
//- when the directory corresponding to FOAM_RESOURCE_SITE_ENVNAME is empty.
// The fallback search appends "/site" to the directory.
//
-// Default: "WM_PROJECT_INST_DIR"
-//
-// \note If packaging OpenFOAM into a single directory (eg, spack, EasyBuild),
-// this should be changed to "WM_PROJECT_DIR" to avoid searching within
-// the prefix (parent) directory.
-//
+// Default: "WM_PROJECT_DIR"
// Used by foamEtcFiles() and stringOps::expand()
-#define FOAM_RESOURCE_SITE_FALLBACK_ENVNAME "WM_PROJECT_INST_DIR"
+#define FOAM_RESOURCE_SITE_FALLBACK_ENVNAME "WM_PROJECT_DIR"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //