From 230331d9a538da35113aa63a12f5c937f402353a Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Tue, 25 Jun 2024 15:57:13 +0200
Subject: [PATCH] Cleanup of path variables.

---
 Makefile              |  1 -
 Makelocal.mk.tpl      |  8 --------
 README.md             | 15 ++++++---------
 lib/make/mb_build.mk  |  3 +--
 lib/make/mb_msxhub.mk |  3 +--
 lib/make/msxbuild.mk  |  1 -
 6 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 Makelocal.mk.tpl

diff --git a/Makefile b/Makefile
index 4365905..fb21560 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,6 @@ BUILD_HELP += \\n\\t* clean
 clean:
 	$(call mb_clean,$(PATH_BIN))
 
--include Makelocal.mk
 MB_OPENMSX_PATH_BIN ?= $(PATH_BIN)
 include lib/make/msxbuild.mk
 include $(INC_TEST)
diff --git a/Makelocal.mk.tpl b/Makelocal.mk.tpl
deleted file mode 100644
index 8a97ff5..0000000
--- a/Makelocal.mk.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Local included makefile fragment.
-# Save this file without tpl suffix and custumize it.
-#
-# Change to local installations if needed;
-
-#PATH_SDCC       ?= /usr/bin
-#PATH_UNIX2DOS   ?= /usr/bin
-#PATH_OPENMSX    ?= /opt/openMSX/bin/
diff --git a/README.md b/README.md
index aa2e5a9..3a44c4d 100644
--- a/README.md
+++ b/README.md
@@ -29,26 +29,23 @@ The files in this repro try to handle these steps for you.
 
 ## Dependencies
 
-* make
-* openmsx
+* make + wget + tar + dos2unix
 * sdcc
-* wget
-* unix2dos
+* openmsx
 
 For debian use;
 
-	apt-get install make openmsx wget dos2unix sdcc
+	apt-get install make wget tar dos2unix sdcc openmsx
 
 ## Usage
 
 Include the `lib/make/msxbuild.mk` file from your Makefile.
-And override the required paths;
+And override the paths if needed;
 * PATH_SDCC       ?= /usr/bin
-* PATH_UNIX2DOS   ?= /usr/bin
 * PATH_OPENMSX    ?= /usr/bin
-* PATH_MSXBUILD   ?= /opt/msxbuild
 
-Then build result based compile rules see an example in; `test/ahello-m80/0module.mk`  
+Then build result based compile rules see an example in; `test/ahello-m80/0module.mk`
+
 When you want to see whats happening do a debug run;
 
 	normal run;
diff --git a/lib/make/mb_build.mk b/lib/make/mb_build.mk
index 0c0a5f5..ef39403 100644
--- a/lib/make/mb_build.mk
+++ b/lib/make/mb_build.mk
@@ -8,14 +8,13 @@ MB_BUILD_SDCC_CMD      ?= $(PATH_SDCC)/sdcc
 MB_BUILD_SDASM_CMD     ?= $(PATH_SDCC)/sdasz80
 MB_BUILD_SDAR_CMD      ?= $(PATH_SDCC)/sdar
 MB_BUILD_SDOBJCOPY_CMD ?= $(PATH_SDCC)/sdobjcopy
-MB_BUILD_UNIX2DOS_CMD  ?= $(PATH_UNIX2DOS)/unix2dos
 
 # TODO: Add C + mixed support;
 #$(MB_SDASM) -I$(MB_LIBASM_SRC)/include
 #-l$(LIBASM_LINK)
 
 define mb_unix2dos
-	$(MB_BUILD_UNIX2DOS_CMD) -n $(1) $(2)
+	unix2dos -n $(1) $(2)
 endef
 
 define mb_compile_asm
diff --git a/lib/make/mb_msxhub.mk b/lib/make/mb_msxhub.mk
index 94e8f78..ac39738 100644
--- a/lib/make/mb_msxhub.mk
+++ b/lib/make/mb_msxhub.mk
@@ -1,7 +1,6 @@
 
 MB_MSXHUB_API   ?= https://msxhub.com/api
 MB_MSXHUB_CACHE ?= $(MB_CACHE)/msxhub/repro-v0
-MB_MSXHUB_WGET  ?= wget
 
 # NOTE: with HDD import/export we get duplicate files after openMSX run, so force to lowercase.
 define _mb_lowercase
@@ -11,7 +10,7 @@ endef
 define _mb_msxhub_file_fetch
 	@echo === Fetch msxhub file
 	$(if $(wildcard $(dir $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)))),,$(call mb_mkdir,$(dir $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)))))
-	$(if $(wildcard $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1))),,$(MB_MSXHUB_WGET) -O $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)) $(1))
+	$(if $(wildcard $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1))),,wget -O $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(1)) $(1))
 endef
 
 define mb_msxhub_file
diff --git a/lib/make/msxbuild.mk b/lib/make/msxbuild.mk
index 6022f7b..bd86988 100644
--- a/lib/make/msxbuild.mk
+++ b/lib/make/msxbuild.mk
@@ -4,7 +4,6 @@
 
 # Setup required tools paths
 PATH_SDCC          ?= /usr/bin
-PATH_UNIX2DOS      ?= /usr/bin
 PATH_OPENMSX       ?= /usr/bin
 PATH_MSXBUILD      ?= $(dir $(lastword $(MAKEFILE_LIST)))../..
 PATH_MSXBUILD_REAL := $(if $(realpath $(PATH_MSXBUILD)),$(realpath $(PATH_MSXBUILD)),$(PATH_MSXBUILD))