From a502318842d296e3257ee42b187fa065b707917e Mon Sep 17 00:00:00 2001
From: Tobiasz Laskowski <tobil4sk@outlook.com>
Date: Thu, 5 Sep 2024 00:13:37 +0100
Subject: [PATCH] [make] Clean up haxelib build output

---
 Makefile     | 10 +++++-----
 Makefile.win |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 567410f8c2a..78579f1221e 100644
--- a/Makefile
+++ b/Makefile
@@ -105,13 +105,13 @@ copy_haxetoolkit: /cygdrive/c/HaxeToolkit/haxe/haxe.exe
 endif
 
 HAXE_STD_PATH=$(CURDIR)/std
-HAXELIB_SRC_PATH=$(CURDIR)/extra/haxelib_src
+HAXELIB_SRC_PATH=extra/haxelib_src
 
 $(HAXELIB_SRC_PATH)/haxelib_hxb.zip:
-	HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \
+	HAXE_STD_PATH=$(HAXE_STD_PATH) ./$(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \
 		each.hxml --interp haxelib.client.Main --hxb haxelib_hxb.zip
 
-HAXELIB_INTERP=HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) \
+HAXELIB_INTERP=HAXE_STD_PATH=./std ./$(HAXE_OUTPUT) \
 	--hxb-lib $(HAXELIB_SRC_PATH)/haxelib_hxb.zip --run haxelib.client.Main
 
 haxelib_hxcpp: $(HAXELIB_SRC_PATH)/haxelib_hxb.zip
@@ -119,12 +119,12 @@ haxelib_hxcpp: $(HAXELIB_SRC_PATH)/haxelib_hxb.zip
 	$(HAXELIB_INTERP) path hxcpp > /dev/null || \
 		($(HAXELIB_INTERP) git hxcpp https://github.com/HaxeFoundation/hxcpp.git && \
 		hxcpp_path=`$(HAXELIB_INTERP) libpath hxcpp | tr -d '\r'` && \
-		$(CURDIR)/$(HAXE_OUTPUT) --cwd $$hxcpp_path/tools/hxcpp compile.hxml)
+		./$(HAXE_OUTPUT) --cwd $$hxcpp_path/tools/hxcpp compile.hxml)
 
 # haxelib should depends on haxe, but we don't want to do that...
 # since haxelib isn't available in PATH yet, we have to pass -D no-compilation and build manually
 haxelib: $(HAXELIB_SRC_PATH)/haxelib_hxb.zip haxelib_hxcpp
-	HAXE_STD_PATH=$(HAXE_STD_PATH) $(CURDIR)/$(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \
+	HAXE_STD_PATH=$(HAXE_STD_PATH) ./$(HAXE_OUTPUT) --cwd $(HAXELIB_SRC_PATH) \
 		client_cpp.hxml -D destination=../../../../$(HAXELIB_OUTPUT) -D no-compilation
 	$(HAXELIB_INTERP) --cwd $(HAXELIB_SRC_PATH)/bin/cpp run hxcpp Build.xml haxe
 
diff --git a/Makefile.win b/Makefile.win
index b0a80231272..853122a040b 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -4,7 +4,6 @@ include Makefile
 HAXE_OUTPUT=haxe.exe
 HAXELIB_OUTPUT=haxelib.exe
 HAXE_STD_PATH=$(shell cygpath -m "$(CURDIR)/std")
-HAXELIB_SRC_PATH=$(shell cygpath -m "$(CURDIR)/extra/haxelib_src")
 PREBUILD_OUTPUT=prebuild.exe
 EXTENSION=.exe
 PACKAGE_SRC_EXTENSION=.zip