also need to set PREFIX in osxapp

This commit is contained in:
Joey Hess 2013-12-15 16:53:31 -04:00
parent 3c90544635
commit 1875b90f38

View file

@ -1,9 +1,11 @@
mans=git-annex.1 git-annex-shell.1 mans=git-annex.1 git-annex-shell.1
all=git-annex $(mans) docs all=git-annex $(mans) docs
GHC?=ghc
PREFIX?=/usr
CABAL?=cabal # set to "./Setup" if you lack a cabal program 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. # Am I typing :make in vim? Do a fast build.
ifdef VIM ifdef VIM
@ -33,8 +35,6 @@ git-union-merge.1: doc/git-union-merge.mdwn
git-union-merge: git-union-merge:
$(GHC) --make -threaded $@ $(GHC) --make -threaded $@
SHAREDIR?=share
install-mans: $(mans) install-mans: $(mans)
install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1 install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/man/man1
install -m 0644 $(mans) $(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" install -d "$(OSXAPP_BASE)/templates"
# OSX looks in man dir nearby the bin # 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) ./Build/OSXMkLibs $(OSXAPP_BASE)
cd $(OSXAPP_DEST) && find . -type f > Contents/MacOS/git-annex.MANIFEST cd $(OSXAPP_DEST) && find . -type f > Contents/MacOS/git-annex.MANIFEST