summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Carstairs <me@joeac.net>2026-07-03 09:20:19 +0100
committerJoe Carstairs <me@joeac.net>2026-07-03 10:17:07 +0100
commit6a23042b7452b64f2e141ce9964247d813620b97 (patch)
treeeb37a6325fef7b79d4f638f464dc9b6ebec4ead7
parentdcd2e1cd19e5473233ebe223b906c4200b69bf1e (diff)
makes capitalise func POSIX-compatible
-rw-r--r--make/nginx.mk2
-rw-r--r--make/vars.mk2
2 files changed, 2 insertions, 2 deletions
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)