diff --git a/make/proj.mk b/make/proj.mk
index 69b7e6b..229f670 100644
--- a/make/proj.mk
+++ b/make/proj.mk
@@ -1,10 +1,12 @@
-# to be included from inside the project directory
-
-DEV_PROJECTS_DIR            ?= $(TOPDIR)/..
+# To be included from inside the project directory
 
+# -- Find JWBDIR
 ifeq ($(TARGET),mingw)
   FLAVOUR_PATH_PREFIX        = win32/
 endif
-JWBDIR                      ?= $(firstword $(wildcard $(DEV_PROJECTS_DIR)/jw-build $(BUILD_TOOLS_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)jw-build))
+DEV_PROJECTS_DIR            ?= $(TOPDIR)/..
+JWBDIR_NAME                 ?= jw-build
+JWBDIR_SEARCH_PATH          ?= $(DEV_PROJECTS_DIR) $(BUILD_TOOLS_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)
+JWBDIR                      ?= $(firstword $(wildcard $(addsuffix /$(JWBDIR_NAME),$(JWBDIR_SEARCH_PATH))))
 
 USE_PROJECT_LIB              = false