summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-15 16:53:31 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-15 16:53:31 -0400
commitd5926a04721245ce838ffaa693371d631aaeeed1 (patch)
tree81df364dbe5a438050c358654d16ae1ed7c07e44 /Makefile
parentde3d81de188e23e9843061b93441d13b2429de37 (diff)
also need to set PREFIX in osxapp
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 811803c87..6ade2c5bd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,11 @@
mans=git-annex.1 git-annex-shell.1
all=git-annex $(mans) docs
+CABAL?=cabal # set to "./Setup" if you lack a cabal program
GHC?=ghc
+
PREFIX?=/usr
-CABAL?=cabal # set to "./Setup" if you lack a cabal program
+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