From 6a726a331da8e3265c70e3d0401432c8c7271e62 Mon Sep 17 00:00:00 2001
From: Joe Carstairs <me@joeac.net>
Date: Thu, 2 Jul 2026 08:10:13 +0100
Subject: [PATCH] simplifies uninstall rule with var

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

diff --git a/Makefile b/Makefile
index 44e3504..8334163 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ $(foreach module,$(MODULES),$(eval $(call module_env_rule)))
 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
+uninstall: uninstall_nginx uninstall_dyndns uninstall_joeac.net_service $(UNINSTALL_RULES) uninstall_crontab
 
 $(foreach module,$(MODULES),$(eval $(install_module_rule)))
 $(foreach module,$(MODULES),$(eval $(reinstall_module_rule)))
diff --git a/make/vars.mk b/make/vars.mk
index 62520cf..a56895b 100644
--- a/make/vars.mk
+++ b/make/vars.mk
@@ -17,6 +17,7 @@ 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))
+UNINSTALL_RULES := $(foreach module,$(MODULES),uninstall_$(module))
 SUBDOMAIN_http := @
 SUBDOMAIN_vaultwarden := pwd
 SUBDOMAIN_etherpad := docs