aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-26 14:54:24 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-26 14:54:24 -0400
commit553ed7fc4e16e6bc52b86e3324e9e1d7f9bd18c8 (patch)
treecd0fb2889f31b59053d74f7a3078689a9ff97281 /Makefile
parent7a237b7a0319e9d657eb7ae3424ccb0a5d23c54f (diff)
fix osxapp target
Broken by recent changes to other targets
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d024fed11..a7d0f5d58 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