:: commit ecdc71e08a6d0a02c8c58c80f0008efd2c163d27

mintsuki <mintsuki@protonmail.com> — 2021-11-28 18:14

parents: 624228c83c

build: Fix up MKESCAPE macro logic

diff --git a/Makefile b/Makefile
index a1d89fe8..8a1dbedf 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ BINDIR ?= $(BUILDDIR)/bin
 
 SPACE := $(subst ,, )
 
-MKESCAPE = $(subst #,\#,$(subst $$,$$$$,$(subst $(SPACE),\ ,$(1))))
+MKESCAPE = $(subst $(SPACE),\ ,$(1))
 SHESCAPE = $(subst ','\'',$(1))
 
 export PATH := $(shell pwd)/toolchain/bin:$(PATH)
diff --git a/decompressor/Makefile b/decompressor/Makefile
index 9b53840f..ba835fee 100644
--- a/decompressor/Makefile
+++ b/decompressor/Makefile
@@ -6,7 +6,7 @@ BUILDDIR =
 
 SPACE := $(subst ,, )
 
-MKESCAPE = $(subst #,\#,$(subst $$,$$$$,$(subst $(SPACE),\ ,$(1))))
+MKESCAPE = $(subst $(SPACE),\ ,$(1))
 SHESCAPE = $(subst ','\'',$(1))
 OBJESCAPE = $(subst .a ,.a' ',$(subst .o ,.o' ',$(call SHESCAPE,$(1))))
 
diff --git a/stage23/Makefile b/stage23/Makefile
index cb6408ce..c526a155 100644
--- a/stage23/Makefile
+++ b/stage23/Makefile
@@ -9,7 +9,7 @@ SRCDIR := $(shell pwd)
 
 SPACE := $(subst ,, )
 
-MKESCAPE = $(subst #,\#,$(subst $$,$$$$,$(subst $(SPACE),\ ,$(1))))
+MKESCAPE = $(subst $(SPACE),\ ,$(1))
 SHESCAPE = $(subst ','\'',$(1))
 OBJESCAPE = $(subst .a ,.a' ',$(subst .o ,.o' ',$(call SHESCAPE,$(1))))
 
tab: 248 wrap: offon