From b0fe5b4a44a27996236c9aa55a0bb6b2b075064d Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Thu, 2 Jul 2026 08:05:51 +0100
Subject: [PATCH] uses vars to simplify install rule

---
 Makefile     | 2 +-
 make/vars.mk | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5faef6c..44e3504 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ $(foreach module,$(MAKE_MODULES),$(eval $(call make_module_rule)))
 $(foreach module,$(MODULES),$(eval $(call module_env_rule)))
 
 .PHONY: install
-install: install_nginx $(foreach module,$(MODULES),$(module)/.env install_$(module)) install_crontab
+install: install_nginx $(ENV_RULES) $(INSTALL_RULES) install_crontab
 
 .PHONY: uninstall
 uninstall: uninstall_nginx uninstall_dyndns uninstall_joeac.net_service $(foreach module,$(MODULES),uninstall_$(module)) uninstall_crontab
diff --git a/make/vars.mk b/make/vars.mk
index 5b01e00..62520cf 100644
--- a/make/vars.mk
+++ b/make/vars.mk
@@ -16,6 +16,7 @@ ENV_RULES := $(foreach module,$(MODULES),$(module)/.env)
 MAKE_RULES := $(foreach module,$(MAKE_MODULES),make_$(module))
 BUILD_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),build_$(module))
 PUSH_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),push_$(module))
+INSTALL_RULES := $(foreach module,$(MODULES),install_$(module))
 SUBDOMAIN_http := @
 SUBDOMAIN_vaultwarden := pwd
 SUBDOMAIN_etherpad := docs