From 86aed0ce9dda2b69dcea558b48d5dbb93918ee4c Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Thu, 23 Sep 2021 09:00:18 -0400
Subject: [PATCH] Use Makefile wildcard for presets/ dir in helper.py, since
 the dir is optional. Fix location of Fundamental.vcvplugin in Mac bundle.

---
 Makefile  | 5 ++++-
 helper.py | 4 ++--
 plugin.mk | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 22580567..72045524 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ ifdef ARCH_MAC
 	cp -R $(DIST_RES) dist/"$(DIST_BUNDLE)"/Contents/Resources/
 	cp $(DIST_HTML) dist/"$(DIST_BUNDLE)"/Contents/Resources/
 	cp -R icon.icns dist/"$(DIST_BUNDLE)"/Contents/Resources/
-	cp plugins/Fundamental/dist/Fundamental-*.vcvplugin dist/"$(DIST_BUNDLE)"/Fundamental.vcvplugin
+	cp plugins/Fundamental/dist/Fundamental-*.vcvplugin dist/"$(DIST_BUNDLE)"/Contents/Resources/Fundamental.vcvplugin
 	# Clean up and sign bundle
 	xattr -cr dist/"$(DIST_BUNDLE)"
 	# This will only work if you have the private key to my certificate
@@ -253,6 +253,9 @@ ifdef ARCH_MAC
 endif
 
 
+cleandist:
+	rm -rfv dist
+
 # Plugin helpers
 
 plugins:
diff --git a/helper.py b/helper.py
index 44b74d8f..8af71f45 100755
--- a/helper.py
+++ b/helper.py
@@ -88,9 +88,9 @@ SOURCES += $(wildcard src/*.cpp)
 
 # Add files to the ZIP package when running `make dist`
 # The compiled plugin and "plugin.json" are automatically added.
-DISTRIBUTABLES += $(wildcard LICENSE*)
 DISTRIBUTABLES += res
-DISTRIBUTABLES += presets
+DISTRIBUTABLES += $(wildcard LICENSE*)
+DISTRIBUTABLES += $(wildcard presets)
 
 # Include the Rack plugin Makefile framework
 include $(RACK_DIR)/plugin.mk
diff --git a/plugin.mk b/plugin.mk
index 7cde265e..600815ff 100644
--- a/plugin.mk
+++ b/plugin.mk
@@ -73,7 +73,11 @@ else
 	$(STRIP) -s dist/$(SLUG)/$(TARGET)
 endif
 	@# Copy distributables
-	rsync -vrR --ignore-missing-args $(DISTRIBUTABLES) dist/$(SLUG)/
+ifdef ARCH_MAC
+	rsync -rR $(DISTRIBUTABLES) dist/$(SLUG)/
+else
+	cp -r --parents $(DISTRIBUTABLES) dist/$(SLUG)/
+endif
 	@# Create ZIP package
 	cd dist && tar -c $(SLUG) | zstd -$(ZSTD_COMPRESSION_LEVEL) -o "$(SLUG)"-"$(VERSION)"-$(ARCH).vcvplugin