From 31a80a88d6f0772f0e8c32d4696475643a0a10fd Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 5 Nov 2025 10:42:53 +0100 Subject: [PATCH] proj.mk: Support JWBDIR_NAME and JWBDIR_SEARCH_PATH - Streamline proj.mk over all projects a little - Turn the string "jw-build" into a variable which can be overridden from the environment. - Add support for JWBDIR_SEARCH_PATH, also overridable from the environment. Signed-off-by: Jan Lindemann --- make/proj.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/make/proj.mk b/make/proj.mk index a9d52d8..c0a94da 100644 --- a/make/proj.mk +++ b/make/proj.mk @@ -1,7 +1,10 @@ -# to be included from inside the project directory +# To be included from inside the project directory +# -- Find JWBDIR DEV_PROJECTS_DIR ?= $(TOPDIR)/.. -JWBDIR ?= $(firstword $(wildcard $(DEV_PROJECTS_DIR)/jw-build $(BUILD_TOOLS_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)jw-build)) +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)))) include $(JWBDIR)/make/projects.mk