also need to set PREFIX in osxapp
This commit is contained in:
parent
3c90544635
commit
1875b90f38
1 changed files with 5 additions and 5 deletions
10
Makefile
10
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
|
||||
|
|
Loading…
Reference in a new issue