From 99aa9e00273a33ec3ac23fd7e730fae217828572 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 14 Feb 2024 21:50:54 +0000
Subject: [PATCH] make everything absolute path

---
 Makefile | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index b82bf05..c48e568 100644
--- a/Makefile
+++ b/Makefile
@@ -9,10 +9,10 @@ image_repo_escaped = $(subst /,\/,$(image_repo))
 image_repo_double_escaped = $(subst \,\\\,$(image_repo_escaped))
 
 $(image_name)-$(version).iso: boot.iso xorriso/input.txt $(image_name)-$(version)
-	xorriso -dialog on < xorriso/input.txt
+	xorriso -dialog on < $(base_dir)/xorriso/input.txt
 
 boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.tmpl
-	rm -Rf results
+	rm -Rf $(base_dir)/results
 	lorax -p $(image_name) -v $(version) -r $(version) -t $(variant) \
           --isfinal --buildarch=$(arch) --volid=$(image_name)-$(arch)-$(version) \
           --macboot --noupgrade \
@@ -20,12 +20,12 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
           --repo /etc/yum.repos.d/fedora-updates.repo \
           --add-template $(base_dir)/lorax_templates/set_installer.tmpl \
 		  --add-template $(base_dir)/lorax_templates/configure_upgrades.tmpl \
-          ./results/
-	mv results/images/boot.iso $(base_dir)/
+          $(base_dir)/results/
+	mv $(base_dir)/results/images/boot.iso $(base_dir)/
 
 $(image_name)-$(version):
 	podman pull $(image_repo)/$(image_name):$(version)
-	podman save --format oci-dir --compress -o $(image_name)-$(version) $(image_repo)/$(image_name):$(version)
+	podman save --format oci-dir --compress -o $(base_dir)/$(image_name)-$(version) $(image_repo)/$(image_name):$(version)
 	podman rmi $(image_repo)/$(image_name):$(version)
 
 install-deps:
@@ -34,24 +34,24 @@ install-deps:
 
 
 lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
-	sed 's/@IMAGE_NAME@/$(image_name)/'                        lorax_templates/$*.tmpl.in > lorax_templates/$*.tmpl
-	sed 's/@IMAGE_REPO@/$(image_repo_escaped)/'                lorax_templates/$*.tmpl > lorax_templates/$*.tmpl
-	sed 's/@VERSION@/$(version)/'                              lorax_templates/$*.tmpl > lorax_templates/$*.tmpl
-	sed 's/@IMAGE_REPO_ESCAPED@/$(image_repo_double_escaped)/' lorax_templates/$*.tmpl > lorax_templates/$*.tmpl
+	sed 's/@IMAGE_NAME@/$(image_name)/'                        $(base_dir)/lorax_templates/$*.tmpl.in > $(base_dir)/lorax_templates/$*.tmpl
+	sed 's/@IMAGE_REPO@/$(image_repo_escaped)/'                $(base_dir)/lorax_templates/$*.tmpl > $(base_dir)/lorax_templates/$*.tmpl
+	sed 's/@VERSION@/$(version)/'                              $(base_dir)/lorax_templates/$*.tmpl > $(base_dir)/lorax_templates/$*.tmpl
+	sed 's/@IMAGE_REPO_ESCAPED@/$(image_repo_double_escaped)/' $(base_dir)/lorax_templates/$*.tmpl > $(base_dir)/lorax_templates/$*.tmpl
 
 
 
 xorriso/input.txt: xorriso/gen_input.sh
-	bash xorriso/gen_input.sh | tee xorriso/input.txt
+	bash $(base_dir)/xorriso/gen_input.sh | tee $(base_dir)/xorriso/input.txt
 
 xorriso/%.sh: xorriso/%.sh.in
-	sed 's/@IMAGE_NAME@/$(image_name)-$(version)/' xorriso/$*.sh.in > xorriso/$*.sh
-	sed 's/@VERSION@/$(version)/'                  xorriso/$*.sh > xorriso/$*.sh
+	sed 's/@IMAGE_NAME@/$(image_name)-$(version)/' $(base_dir)/xorriso/$*.sh.in > $(base_dir)/xorriso/$*.sh
+	sed 's/@VERSION@/$(version)/'                  $(base_dir)/xorriso/$*.sh > $(base_dir)/xorriso/$*.sh
 
 
 clean:
-	rm -f *.iso || true
-	rm -Rf $(image_name)-$(version) || true
-	rm lorax_templates/*.tmpl || true
-	rm xorriso/input.txt || true
-	rm xorriso/*.sh || true
+	rm -f $(base_dir)/*.iso || true
+	rm -Rf $(base_dir)/$(image_name)-$(version) || true
+	rm $(base_dir)/lorax_templates/*.tmpl || true
+	rm $(base_dir)/xorriso/input.txt || true
+	rm $(base_dir)/xorriso/*.sh || true