From 1875b90f38f248679c7da15bfa6a4887349bdf64 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Dec 2013 16:53:31 -0400 Subject: [PATCH] also need to set PREFIX in osxapp --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 811803c879..6ade2c5bd3 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,11 @@ mans=git-annex.1 git-annex-shell.1 all=git-annex $(mans) docs -GHC?=ghc -PREFIX?=/usr CABAL?=cabal # set to "./Setup" if you lack a cabal program +GHC?=ghc + +PREFIX?=/usr +SHAREDIR?=share # Am I typing :make in vim? Do a fast build. ifdef VIM @@ -33,8 +35,6 @@ git-union-merge.1: doc/git-union-merge.mdwn git-union-merge: $(GHC) --make -threaded $@ -SHAREDIR?=share - install-mans: $(mans) install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1 install -m 0644 $(mans) $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1 @@ -163,7 +163,7 @@ osxapp: Build/Standalone Build/OSXMkLibs install -d "$(OSXAPP_BASE)/templates" # OSX looks in man dir nearby the bin - $(MAKE) install-mans DESTDIR="$(OSXAPP_BASE)" SHAREDIR="" + $(MAKE) install-mans DESTDIR="$(OSXAPP_BASE)/.." SHAREDIR="" PREFIX="" ./Build/OSXMkLibs $(OSXAPP_BASE) cd $(OSXAPP_DEST) && find . -type f > Contents/MacOS/git-annex.MANIFEST