STYLE: respect WM_DIR value when building wmake tools

- minor bug: 'wclean empty' may have had issues with logical vs physical path
This commit is contained in:
Mark Olesen 2017-03-29 13:49:15 +02:00
parent 3ece6e521a
commit 446b8e7188
2 changed files with 3 additions and 3 deletions

View File

@ -22,8 +22,8 @@ echo " $WM_COMPILER $WM_COMPILER_TYPE compiler"
echo " ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
echo
# Compile wmake support applications
(cd wmake/src && make)
# Compile wmake tools
(cd "${WM_DIR:-wmake}/src" && make)
# Compile ThirdParty libraries and applications
if [ -d "$WM_THIRD_PARTY_DIR" ]

View File

@ -161,7 +161,7 @@ then
# Second pass: clean up object directories with WM_PROJECT_DIR that don't
# have respective source code folders, along with the respective binaries
if [ "$(expandPath $PWD)" = "$WM_PROJECT_DIR" ]
if [ "$(expandPath $PWD)" = "$(expandPath $WM_PROJECT_DIR)" ]
then
objectsDir=$(findObjectDir $PWD 2>/dev/null) || exit 1 # Fatal