From 21b625be43efbf9d998c2b52c15eb17027211870 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Sun, 28 Nov 2021 19:14:34 +0100 Subject: [PATCH] build: Fix up MKESCAPE macro logic --- Makefile | 2 +- decompressor/Makefile | 2 +- stage23/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3c3023e6..a65e3e13 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))))