From 9fe7910e6acf71a4a7a055aff88594f1898e2842 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Wed, 14 Sep 2022 06:18:08 -0400
Subject: [PATCH] Define ARCH_FULL_NAME in arch.mk. Use "mac_arm64" in dist
 filenames on Mac arm64.

---
 Makefile  | 4 ++--
 arch.mk   | 6 ++++++
 plugin.mk | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index b8588b5e..3a15b940 100644
--- a/Makefile
+++ b/Makefile
@@ -143,9 +143,9 @@ ifdef ARCH_WIN
 endif
 
 DIST_RES := res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt
-DIST_NAME := RackFree-"$(VERSION)"-$(ARCH_OS_NAME)
+DIST_NAME := RackFree-"$(VERSION)"-$(ARCH_FULL_NAME)
 DIST_SDK_DIR := Rack-SDK
-DIST_SDK := Rack-SDK-"$(VERSION)"-$(ARCH_OS_NAME).zip
+DIST_SDK := Rack-SDK-"$(VERSION)"-$(ARCH_FULL_NAME).zip
 ifdef ARCH_MAC
 	DIST_BUNDLE := VCV Rack $(VERSION_MAJOR) Free.app
 else
diff --git a/arch.mk b/arch.mk
index 851e85b6..50049263 100644
--- a/arch.mk
+++ b/arch.mk
@@ -26,3 +26,9 @@ else ifneq (,$(findstring linux,$(MACHINE_OS)))
 else
 $(error Operating system $(MACHINE_OS) not supported)
 endif
+
+
+ARCH_FULL_NAME := $(ARCH_OS_NAME)
+ifndef ARCH_X64
+	ARCH_FULL_NAME := $(ARCH_FULL_NAME)_$(ARCH_NAME)
+endif
diff --git a/plugin.mk b/plugin.mk
index 3258094f..a16b3649 100644
--- a/plugin.mk
+++ b/plugin.mk
@@ -79,7 +79,7 @@ else
 	cp -r --parents $(DISTRIBUTABLES) dist/$(SLUG)/
 endif
 	@# Create ZIP package
-	cd dist && tar -c $(SLUG) | zstd -$(ZSTD_COMPRESSION_LEVEL) -o "$(SLUG)"-"$(VERSION)"-$(ARCH_OS_NAME).vcvplugin
+	cd dist && tar -c $(SLUG) | zstd -$(ZSTD_COMPRESSION_LEVEL) -o "$(SLUG)"-"$(VERSION)"-$(ARCH_FULL_NAME).vcvplugin
 
 install: dist
 	mkdir -p "$(RACK_USER_DIR)"/plugins/