mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Makefile improvement for BUILDER=stack, use stack to run ghc.

Browse source
This commit is contained in:
Joey Hess 2017-11-07 16:56:48 -04:00
parent 1738c801eb
commit 49663ab6a8
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -8,6 +8,7 @@ git-annex (6.20171027) UNRELEASED; urgency=medium
work. work.
* Makefile improvement for sudo make install. * Makefile improvement for sudo make install.
Thanks, Eric Siegerman Thanks, Eric Siegerman
* Makefile improvement for BUILDER=stack, use stack to run ghc.
-- Joey Hess <id@joeyh.name> Mon, 30 Oct 2017 12:01:45 -0400 -- Joey Hess <id@joeyh.name> Mon, 30 Oct 2017 12:01:45 -0400

4
Makefile
View file

@ -2,7 +2,11 @@ all=git-annex git-annex-shell mans docs
# set to "./Setup" if you lack a cabal program. Or can be set to "stack" # set to "./Setup" if you lack a cabal program. Or can be set to "stack"
BUILDER?=cabal BUILDER?=cabal
ifeq ($(BUILDER),stack)
GHC?=stack ghc --
else
GHC?=ghc GHC?=ghc
endif
PREFIX?=/usr PREFIX?=/usr
SHAREDIR?=share SHAREDIR?=share