diff --git a/Allwmake b/Allwmake
index de7a288ec8..158d10ad42 100755
--- a/Allwmake
+++ b/Allwmake
@@ -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" ]
diff --git a/wmake/wclean b/wmake/wclean
index 3becc51746..f75e90fcaf 100755
--- a/wmake/wclean
+++ b/wmake/wclean
@@ -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