fix osxapp build issue
authorJoey Hess <joeyh@joeyh.name>
Mon, 10 Aug 2020 22:41:02 +0000 (18:41 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 10 Aug 2020 22:41:02 +0000 (18:41 -0400)
need to build git-annex 1st, otherwise otool can't run

Makefile

index b0bf6d054d25a57571ba62db395835a4936c319d..9238a0a600c1720bdae8d412839d09d971dc70ad 100644 (file)
--- 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