diff options
| author | Joe Carstairs <me@joeac.net> | 2026-07-01 16:46:59 +0100 |
|---|---|---|
| committer | Joe Carstairs <me@joeac.net> | 2026-07-01 16:47:06 +0100 |
| commit | e3b34849057b69e840b926c6890ed2fcf4d0a5a0 (patch) | |
| tree | 44b66a78f381d6bb575ab90d9c3b0da3eb937791 | |
| parent | def393b9300b66b12692df0123f6e79100c9842b (diff) | |
switches to directory for submake file
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | ln/install.mk | 6 |
2 files changed, 5 insertions, 7 deletions
@@ -63,7 +63,7 @@ endef define install_module_rule = .PHONY: install_$(module) install_$(module): install_openrc_$(module) $(nginx_module_target) $(dyndns_module_target) $(install_submake_file) - $(if $(install_submake_file),$(MAKE) --makefile=$(install_submake_file) install) + $(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) install) endef define install_openrc_module_rule = @@ -77,7 +77,7 @@ endef define reinstall_module_rule = .PHONY: reinstall_$(module) reinstall_$(module): reinstall_openrc_$(module) $(nginx_module_target) $(dyndns_module_target) $(install_submake_file) - $(if $(install_submake_file),$(MAKE) --makefile=$(install_submake_file) reinstall) + $(if $(install_submake_file),$(MAKE) --makefile=$(notdir $(install_submake_file)) --directory=$(dir $(install_submake_file)) reinstall) endef define reinstall_openrc_module_rule = @@ -99,7 +99,7 @@ uninstall_$(module): sudo rm -f /etc/periodic/daily/dyndns-$(SUBDOMAIN_$(module)).joeac.net; \ ) $(if $(install_submake_file),\ - $(MAKE) --makefile $(install_submake_file) uninstall + $(MAKE) --makefile=$(notdir (install_submake_file)) --directory $(dir $(install_submake_file)) uninstall ) endef diff --git a/ln/install.mk b/ln/install.mk index 9c64f78..1a43d7f 100644 --- a/ln/install.mk +++ b/ln/install.mk @@ -1,15 +1,13 @@ -LN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) - .PHONY: install install: /var/ln.joeac.net/public .PHONY: reinstall reinstall: install -/var/ln.joeac.net/public: $(LN_DIR)/public +/var/ln.joeac.net/public: public sudo rm -rf /var/ln.joeac.net/public sudo mkdir -p /var/ln.joeac.net/ - sudo cp -r $(LN_DIR)/public/ /var/ln.joeac.net/public/ + sudo cp -r public/ /var/ln.joeac.net/public/ .PHONY: uninstall uninstall: |