From 15a369767983d5f8caaa2a212b45a465e6cedbbd Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Thu, 2 Jul 2026 09:26:33 +0100 Subject: [PATCH 1/2] removes any existing joeac.net openrc service file before installing --- make/openrc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/openrc.mk b/make/openrc.mk index 47ddb7f..6648773 100644 --- a/make/openrc.mk +++ b/make/openrc.mk @@ -6,6 +6,7 @@ define install_openrc_module_rule = install_openrc_$(module): $(if $(is_openrc_module),$(openrc_module_target) openrc_add_$(module) openrc_start_$(module)) ~/.config/rc/init.d/joeac.net.$(module): ~/.config/rc/init.d/joeac.net ~/.config/rc/runlevels/default + rm -f ~/.config/rc/init.d/joeac.net ln -s $(shell realpath ~)/.config/rc/init.d/joeac.net ~/.config/rc/init.d/joeac.net.$(module) endef From 2abd95da6d03699f37bb0382b8f6e10f6fb958bf Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Thu, 2 Jul 2026 09:34:34 +0100 Subject: [PATCH 2/2] has empty make_module rules --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 320e10a..f1f898c 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,8 @@ install_submake_file = $(shell [ -f "$(module)/install.mk" ] && echo "$(module)/ define make_module_rule = .PHONY: make_$(module) make_$(module): $(module)/.env - $(MAKE) --directory=$(module) + $(if $(install_submake_file),\ + $(MAKE) --makefile=$(install_submake_file) --directory=$(module)) endef define module_env_rule = @@ -46,7 +47,7 @@ endef .PHONY: all all: $(ENV_RULES) $(MAKE_RULES) $(BUILD_RULES) $(PUSH_RULES) -$(foreach module,$(MAKE_MODULES),$(eval $(call make_module_rule))) +$(foreach module,$(MODULES),$(eval $(call make_module_rule))) $(foreach module,$(MODULES),$(eval $(call module_env_rule))) .PHONY: install