diff --git a/Makefile b/Makefile index 0f16048..6267130 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,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 = @@ -36,7 +37,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 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