From fb5b69ae5ce71c4d70b2ca3c96a03b3f2f867ffa Mon Sep 17 00:00:00 2001
From: John Schneiderman <JohnMS@member.fsf.org>
Date: Sun, 4 Aug 2024 17:32:13 +0200
Subject: [PATCH] Changes to use commands from variables.

---
 make/makefile | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/make/makefile b/make/makefile
index 8cbdf0d..6a75329 100644
--- a/make/makefile
+++ b/make/makefile
@@ -5,7 +5,8 @@ srcdir := $(if $(srcdir),$(srcdir),$(project_dir)/build)
 
 CXX = c++
 CPPFLAGS = -g -O2 -std=c++11 -Wno-switch
- 
+SED = /usr/bin/sed
+
  $(shell mkdir -p $(project_dir)/bin)
  
 ifdef WINDIR
@@ -29,10 +30,11 @@ endif
 	@$(CXX) -c $(CPPFLAGS) $< -o $(srcdir)/$@
 
 %.d: $(project_dir)/oscar64/%.cpp
-	@set -e; rm -f $(srcdir)/$@; \
+	@echo "Transforming file" $@ "..."
+	@set -e; $(RM) $(srcdir)/$@; \
 	$(CC) -MM $(CPPFLAGS) $< > $(srcdir)/$@.$$$$; \
-	sed 's,\($*\)\.o[ :]*,\1.o $(srcdir)/$@ : ,g' < $(srcdir)/$@.$$$$ > $(srcdir)/$@; \
-	rm -f $(srcdir)/$@.$$$$
+	$(SED) 's,\($*\)\.o[ :]*,\1.o $(srcdir)/$@ : ,g' < $(srcdir)/$@.$$$$ > $(srcdir)/$@; \
+	$(RM) $(srcdir)/$@.$$$$
 
 $(project_dir)/bin/oscar64 : $(objects)
 	@echo "Linking compiler" $@ "..."
@@ -40,7 +42,9 @@ $(project_dir)/bin/oscar64 : $(objects)
 
 .PHONY : clean
 clean :
-	-rm *.o *.d $(project_dir)/bin/oscar64
+	@$(RM) $(srcdir)/*.o
+	@$(RM) $(srcdir)/*.d
+	@$(RM) $(project_dir)/bin/oscar64
 
 ifeq ($(UNAME_S), Darwin)