:: commit 59078754f96d00335566db66d0397dae5a17f1de

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 315c9f67..41b80714 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -29,9 +29,9 @@ override SRCDIR := @SRCDIR@
 override SPACE := $(subst ,, )
 override COMMA := ,
 
-MKESCAPE = $(subst $(SPACE),\ ,$(1))
-SHESCAPE = $(subst ','\'',$(1))
-NASMESCAPE = $(subst ','"'$(COMMA) \"'\"$(COMMA) '"',$(1))
+override MKESCAPE = $(subst $(SPACE),\ ,$(1))
+override SHESCAPE = $(subst ','\'',$(1))
+override NASMESCAPE = $(subst ','"'$(COMMA) \"'\"$(COMMA) '"',$(1))
 
 override USER_VARIABLE = $(if $(filter $(origin $(1)),default undefined),$(eval override $(1) := $(2)))
 
diff --git a/common/common.mk b/common/common.mk
index 6c3aa589..18ce0271 100644
--- a/common/common.mk
+++ b/common/common.mk
@@ -15,9 +15,9 @@ override SRCDIR := $(shell pwd -P)
 
 override SPACE := $(subst ,, )
 
-MKESCAPE = $(subst $(SPACE),\ ,$(1))
-SHESCAPE = $(subst ','\'',$(1))
-OBJESCAPE = $(subst .a ,.a' ',$(subst .o ,.o' ',$(call SHESCAPE,$(1))))
+override MKESCAPE = $(subst $(SPACE),\ ,$(1))
+override SHESCAPE = $(subst ','\'',$(1))
+override OBJESCAPE = $(subst .a ,.a' ',$(subst .o ,.o' ',$(call SHESCAPE,$(1))))
 
 ifeq ($(call MKESCAPE,$(BUILDDIR)),)
     $(error BUILDDIR not specified)
diff --git a/decompressor/decompressor.mk b/decompressor/decompressor.mk
index d988b199..6808cf72 100644
--- a/decompressor/decompressor.mk
+++ b/decompressor/decompressor.mk
@@ -12,9 +12,9 @@ BUILDDIR ?=
 
 override SPACE := $(subst ,, )
 
-MKESCAPE = $(subst $(SPACE),\ ,$(1))
-SHESCAPE = $(subst ','\'',$(1))
-OBJESCAPE = $(subst .a ,.a' ',$(subst .o ,.o' ',$(call SHESCAPE,$(1))))
+override MKESCAPE = $(subst $(SPACE),\ ,$(1))
+override SHESCAPE = $(subst ','\'',$(1))
+override OBJESCAPE = $(subst .a ,.a' ',$(subst .o ,.o' ',$(call SHESCAPE,$(1))))
 
 ifeq ($(call MKESCAPE,$(BUILDDIR)),)
     $(error BUILDDIR not specified)