summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Carstairs <me@joeac.net>2026-07-02 22:23:55 +0100
committerJoe Carstairs <me@joeac.net>2026-07-02 22:23:55 +0100
commit3d87e928d47f14081f9660ff554f52524c0fd619 (patch)
tree49d6ee97029b31175c8f84c02ac31ed2ac2fb8a5
parentc89f338601cd324a24b21a8a2b5bb4666779bba8 (diff)
make_module uses Makefile, not install.mk
-rw-r--r--Makefile5
1 files 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 =