diff --git a/make/nginx.mk b/make/nginx.mk index b8b558a..16510a6 100644 --- a/make/nginx.mk +++ b/make/nginx.mk @@ -23,7 +23,7 @@ endef define uninstall_nginx_module_rule = .PHONY: uninstall_nginx_$(module) uninstall_nginx_$(module): - (if $(SUBDOMAIN_$(module)),rm -f /etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf) + $(if $(SUBDOMAIN_$(module)),rm -f /etc/nginx/http.d/$(SUBDOMAIN_$(module)).joeac.net.conf) endef define remove_nginx_site_rule = diff --git a/make/vars.mk b/make/vars.mk index 2033a06..6ab3af4 100644 --- a/make/vars.mk +++ b/make/vars.mk @@ -1,4 +1,4 @@ -capitalise = $(shell _v="$(1)"; echo $${_v^^}) +capitalise = $(shell echo "$(1)" | tr '[:lower:]' '[:upper:]') USER := $(shell whoami) HOSTNAME := $(shell cat /etc/hostname)