From 1abeb71f570ff978c2ff81bf6fd9851b86cc7be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Mon, 3 Oct 2022 10:55:56 +0200
Subject: [PATCH] Fix Linux & macOS packaging issue with FFmpeg

FFmpeg was put in the wrong location in the release packages for Linux and
macOS. It should have been in a subdirectory called `tools` so that the
Worker finds it, but it was in the top-level directory of the package.
This is now fixed.
---
 Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 7702eb80..d53089df 100644
--- a/Makefile
+++ b/Makefile
@@ -299,8 +299,9 @@ release-package-linux:
 	$(MAKE) -s flamenco-manager-without-webapp GOOS=linux GOARCH=amd64
 	$(MAKE) -s flamenco-worker GOOS=linux GOARCH=amd64
 	$(MAKE) -s tools-linux
-	mkdir -p dist/${RELEASE_PACKAGE_LINUX_BASE}
-	cp flamenco-manager flamenco-worker ${RELEASE_PACKAGE_EXTRA_FILES} tools/*-linux* dist/${RELEASE_PACKAGE_LINUX_BASE}
+	mkdir -p dist/${RELEASE_PACKAGE_LINUX_BASE}/tools
+	cp flamenco-manager flamenco-worker ${RELEASE_PACKAGE_EXTRA_FILES} dist/${RELEASE_PACKAGE_LINUX_BASE}
+	cp tools/*-linux* dist/${RELEASE_PACKAGE_LINUX_BASE}/tools
 	cd dist; tar zcvf ${RELEASE_PACKAGE_LINUX} ${RELEASE_PACKAGE_LINUX_BASE}
 	rm -rf dist/${RELEASE_PACKAGE_LINUX_BASE}
 	@echo "Done! Created ${RELEASE_PACKAGE_LINUX}"
@@ -312,8 +313,9 @@ release-package-darwin:
 	$(MAKE) -s flamenco-manager-without-webapp GOOS=darwin GOARCH=amd64
 	$(MAKE) -s flamenco-worker GOOS=darwin GOARCH=amd64
 	$(MAKE) -s tools-darwin
-	mkdir -p dist/${RELEASE_PACKAGE_DARWIN_BASE}
-	cp flamenco-manager flamenco-worker ${RELEASE_PACKAGE_EXTRA_FILES} tools/*-darwin* dist/${RELEASE_PACKAGE_DARWIN_BASE}
+	mkdir -p dist/${RELEASE_PACKAGE_DARWIN_BASE}/tools
+	cp flamenco-manager flamenco-worker ${RELEASE_PACKAGE_EXTRA_FILES} dist/${RELEASE_PACKAGE_DARWIN_BASE}
+	cp tools/*-darwin* dist/${RELEASE_PACKAGE_DARWIN_BASE}/tools
 	cd dist; tar zcvf ${RELEASE_PACKAGE_DARWIN} ${RELEASE_PACKAGE_DARWIN_BASE}
 	rm -rf dist/${RELEASE_PACKAGE_DARWIN_BASE}
 	@echo "Done! Created ${RELEASE_PACKAGE_DARWIN}"