From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 10 Aug 2020 22:41:02 +0000 (-0400)
Subject: fix osxapp build issue
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~118^2~100
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ae954312ab1e90fa863ffdfa2b8f8fcfd9c40d00;p=git-annex.git

fix osxapp build issue

need to build git-annex 1st, otherwise otool can't run
---

diff --git a/Makefile b/Makefile
index b0bf6d054d..9238a0a600 100644
--- a/Makefile
+++ b/Makefile
@@ -206,6 +206,7 @@ dpkg-buildpackage%: prep-standalone
 OSXAPP_DEST=tmp/build-dmg/git-annex.app
 OSXAPP_TOP=$(OSXAPP_DEST)/Contents/MacOS/bundle
 osxapp:
+	$(MAKE) git-annex
 	# Remove all RPATHs, both because this overloads the linker on
 	# OSX Sierra, and to avoid the binary looking in someone's home
 	# directory.
@@ -213,7 +214,7 @@ osxapp:
 		eval install_name_tool $$(otool -l git-annex | grep "path " | sed 's/.*path /-delete_rpath /' | sed 's/ (.*//') git-annex; \
 	fi
 
-	$(MAKE) git-annex Build/Standalone
+	$(MAKE) Build/Standalone
 	./Build/Standalone $(OSXAPP_TOP) $(OSXAPP_DEST)
 
 	gzcat standalone/licences.gz > $(OSXAPP_TOP)/LICENSE