From 1dcd68a14952fa47a466e5f047b8540e93c5dc38 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Feb 2017 14:54:24 -0400 Subject: [PATCH] fix osxapp target Broken by recent changes to other targets --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d024fed114..a7d0f5d58a 100644 --- a/Makefile +++ b/Makefile @@ -122,9 +122,8 @@ Build/MakeMans: Build/MakeMans.hs $(GHC) --make $@ -Wall -fno-warn-tabs LINUXSTANDALONE_DEST=tmp/git-annex.linux -linuxstandalone: - $(MAKE) git-annex linuxstandalone-nobuild -linuxstandalone-nobuild: Build/Standalone Build/LinuxMkLibs +linuxstandalone: + $(MAKE) git-annex Build/Standalone Build/LinuxMkLibs rm -rf "$(LINUXSTANDALONE_DEST)" mkdir -p tmp cp -R standalone/linux/skel "$(LINUXSTANDALONE_DEST)" @@ -182,7 +181,7 @@ dpkg-buildpackage%: prep-standalone OSXAPP_DEST=tmp/build-dmg/git-annex.app OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle osxapp: Build/Standalone Build/OSXMkLibs - $(MAKE) git-annex + $(MAKE) git-annex Build/Standalone Build/OSXMkLibs # Remove all RPATHs, both because this overloads the linker on # OSX Sierra, and to avoid the binary looking in someone's home