diff --git a/ln/install.mk b/ln/install.mk index 1a43d7f..ea622ca 100644 --- a/ln/install.mk +++ b/ln/install.mk @@ -1,14 +1,14 @@ .PHONY: install -install: /var/ln.joeac.net/public +install: $(PUBLIC_ROOT_DIR_ln) .PHONY: reinstall reinstall: install -/var/ln.joeac.net/public: public - sudo rm -rf /var/ln.joeac.net/public - sudo mkdir -p /var/ln.joeac.net/ - sudo cp -r public/ /var/ln.joeac.net/public/ +$(PUBLIC_ROOT_DIR_ln): public + sudo rm -rf $(PUBLIC_ROOT_DIR_ln) + sudo mkdir -p $(PUBLIC_ROOT_DIR_ln) + sudo cp -r public/ $(PUBLIC_ROOT_DIR_ln)/ .PHONY: uninstall uninstall: - sudo rm -rf /var/ln.joeac.net + sudo rm -rf $(PUBLIC_ROOT_DIR_ln) diff --git a/make/vars.mk b/make/vars.mk index d52309b..bcbc13f 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -25,6 +25,8 @@ PORT_gemini := 1965 PORT_smtp := 2500 PORT_vaultwarden := 9000 +PUBLIC_ROOT_DIR_ln := /var/ln.joeac.net/public + $(foreach module,$(ALL_MODULES),$(if $(PORT_$(module)),$(eval \ export $(call capitalise,$(module))_PORT := $(PORT_$(module)))))