From f73512107c7cf8d95fb1f97fa69706a1519e5ca3 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Wed, 1 Jul 2026 18:26:22 +0100 Subject: [PATCH] renames some module rules --- Makefile | 6 +++--- dyndns.mk | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index dea38ef..0b00008 100644 --- a/Makefile +++ b/Makefile @@ -20,19 +20,19 @@ endef define install_module_rule = .PHONY: install_$(module) -install_$(module): install_openrc_$(module) install_nginx_module_$(module) install_dyndns_module_$(module) $(install_submake_file) +install_$(module): install_openrc_$(module) install_nginx_$(module) install_dyndns_$(module) $(install_submake_file) $(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) install) endef define reinstall_module_rule = .PHONY: reinstall_$(module) -reinstall_$(module): reinstall_openrc_$(module) reinstall_nginx_module_$(module) reinstall_dyndns_module_$(module) $(install_submake_file) +reinstall_$(module): reinstall_openrc_$(module) reinstall_nginx_$(module) reinstall_dyndns_$(module) $(install_submake_file) $(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) reinstall) endef define uninstall_module_rule = .PHONY: uninstall_$(module) -uninstall_$(module): uninstall_openrc_$(module) uninstall_nginx_$(module) uninstall_dyndns_module_$(module) +uninstall_$(module): uninstall_openrc_$(module) uninstall_nginx_$(module) uninstall_dyndns_$(module) $(if $(install_submake_file),\ $(MAKE) --makefile=$(notdir (install_submake_file)) --directory $(dir $(install_submake_file)) uninstall ) diff --git a/dyndns.mk b/dyndns.mk index 4598c85..08566a6 100644 --- a/dyndns.mk +++ b/dyndns.mk @@ -1,16 +1,16 @@ define install_dyndns_module_rule = -.PHONY: install_dyndns_module_$(module) +.PHONY: install_dyndns_$(module) install_dyndns_module_$(module): $(if $(SUBDOMAIN_$(module)),/etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net install_dyndns) endef define reinstall_dyndns_module_rule = -.PHONY: reinstall_dyndns_module_$(module) -reinstall_dyndns_module_$(module): $(if $(SUBDOMAIN_$(module)),/etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net reinstall_dyndns) +.PHONY: reinstall_dyndns_$(module) +reinstall_dyndns_$(module): $(if $(SUBDOMAIN_$(module)),/etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net reinstall_dyndns) endef define uninstall_dyndns_module_rule = -.PHONY: uninstall_dyndns_module_$(module) -uninstall_dyndns_module_$(module): +.PHONY: uninstall_dyndns_$(module) +uninstall_dyndns_$(module): $(if $(SUBDOMAIN_$(module)), \ sudo rm -f /etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net ) @@ -28,7 +28,7 @@ $(foreach module,$(ALL_MODULES), $(eval $(uninstall_dyndns_module_rule))) sudo chmod +x $@ .PHONY: uninstall_dyndns -uninstall_dyndns: $(foreach module,$(ALL_MODULES),$(uninstall_dyndns_module_rule)) +uninstall_dyndns: $(foreach module,$(ALL_MODULES),$(uninstall_dyndns_$(module))) sudo rm -rf \ /usr/local/bin/dyndns.sh \ /usr/local/bin/get_ip_addr.sh \