mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix osxapp target

Browse source 
Broken by recent changes to other targets
This commit is contained in:
Joey Hess 2017-02-26 14:54:24 -04:00
parent e8bf942dc4
commit 1dcd68a149
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -122,9 +122,8 @@ Build/MakeMans: Build/MakeMans.hs
$(GHC) --make $@ -Wall -fno-warn-tabs $(GHC) --make $@ -Wall -fno-warn-tabs
LINUXSTANDALONE_DEST=tmp/git-annex.linux LINUXSTANDALONE_DEST=tmp/git-annex.linux
linuxstandalone: linuxstandalone:
$(MAKE) git-annex linuxstandalone-nobuild $(MAKE) git-annex Build/Standalone Build/LinuxMkLibs
linuxstandalone-nobuild: Build/Standalone Build/LinuxMkLibs
rm -rf "$(LINUXSTANDALONE_DEST)" rm -rf "$(LINUXSTANDALONE_DEST)"
mkdir -p tmp mkdir -p tmp
cp -R standalone/linux/skel "$(LINUXSTANDALONE_DEST)" cp -R standalone/linux/skel "$(LINUXSTANDALONE_DEST)"
@ -182,7 +181,7 @@ dpkg-buildpackage%: prep-standalone
OSXAPP_DEST=tmp/build-dmg/git-annex.app OSXAPP_DEST=tmp/build-dmg/git-annex.app
OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle
osxapp: Build/Standalone Build/OSXMkLibs 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 # Remove all RPATHs, both because this overloads the linker on
# OSX Sierra, and to avoid the binary looking in someone's home # OSX Sierra, and to avoid the binary looking in someone's home