From 3d87e928d47f14081f9660ff554f52524c0fd619 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Thu, 2 Jul 2026 22:23:55 +0100 Subject: [PATCH] make_module uses Makefile, not install.mk --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6267130..29d7d49 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,13 @@ include make/vars.mk +submake_file = $(shell [ -f "$(module)/Makefile" ] && echo "$(module)/Makefile") install_submake_file = $(shell [ -f "$(module)/install.mk" ] && echo "$(module)/install.mk") define make_module_rule = .PHONY: make_$(module) make_$(module): $(module)/.env - $(if $(install_submake_file),\ - $(MAKE) --makefile=$(install_submake_file) --directory=$(module)) + $(if $(submake_file),\ + $(MAKE) --makefile=$(notdir $(submake_file)) --directory=$(module)) endef define module_env_rule =