From b9f1ebd4393bae2a2d25eb73eda0c0fb073ecf80 Mon Sep 17 00:00:00 2001
From: Donn <me@donn.website>
Date: Wed, 20 Apr 2022 17:17:23 +0200
Subject: [PATCH] Makefile cleanup, dockerignore

---
 .dockerignore     |  1 +
 appimage/Makefile | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..40272890
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+./appimage
\ No newline at end of file
diff --git a/appimage/Makefile b/appimage/Makefile
index bfa60121..8a533eac 100644
--- a/appimage/Makefile
+++ b/appimage/Makefile
@@ -1,28 +1,24 @@
-all: appimage
-
 RESOURCES = $(shell find rsc/ -type f)
-ARCH = $(shell uname -i)
+ARCH = $(shell uname -m)
 APPIMAGE = Magic-$(ARCH).AppImage
 
-prefix.tar.gz: Dockerfile
+all: $(APPIMAGE)
+
+.PHONY: prefix/bin/magic
+prefix/bin/magic: Dockerfile Makefile
+	rm -rf prefix
 	docker build -t magic_build -f ./Dockerfile ..
 	id=$$(docker create magic_build) ; \
-	docker cp $$id:/prefix.tar.gz ./prefix.tar.gz ; \
+	docker cp $$id:/prefix ./prefix ; \
 	docker rm -v $$id
-
-prefix: prefix.tar.gz Makefile
-	rm -rf $@
-	mkdir -p $@
-	tar -xf $< -C $@ .
-	mkdir -p $@/lib/tcl8.6.12
-	cp -r $@/lib/tcl8.6 $@/lib/tcl8.6.12/library
+	mkdir -p prefix/lib/tcl8.6.12
+	cp -r prefix/lib/tcl8.6 prefix/lib/tcl8.6.12/library
 
 appimagetool:
 	curl -L https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage > ./appimagetool
 	chmod +x ./appimagetool
 
-appimage: $(APPIMAGE)
-$(APPIMAGE): prefix appimagetool $(RESOURCES) 
+$(APPIMAGE): prefix/bin/magic appimagetool $(RESOURCES) 
 	cp $(RESOURCES) ./prefix
 	./appimagetool prefix
 
@@ -32,5 +28,6 @@ install:
 
 .PHONY: clean
 clean:
+	rm -f *.AppImage
 	rm -f prefix.tar.gz
 	rm -rf prefix
\ No newline at end of file