slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: make ghc prefer /usr/lib to avoid iconv link issues on mac

Browse Source 
Harmless on other platforms, hopefully.
This commit is contained in:
Simon Michael 2010-07-09 02:11:12 +00:00
parent ed37346426
commit 169a4944c2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -42,7 +42,8 @@ BINARYFILENAME=`runhaskell ./hledger.hs --binary-filename`
PATCHLEVEL:=$(shell expr `darcs changes --count --from-tag=\\\\\.` - 1) PATCHLEVEL:=$(shell expr `darcs changes --count --from-tag=\\\\\.` - 1)
WARNINGS:=-W -fwarn-tabs #-fwarn-orphans -fwarn-simple-patterns -fwarn-monomorphism-restriction -fwarn-name-shadowing WARNINGS:=-W -fwarn-tabs #-fwarn-orphans -fwarn-simple-patterns -fwarn-monomorphism-restriction -fwarn-name-shadowing
DEFINEFLAGS:=-DMAKE -DPATCHLEVEL=$(PATCHLEVEL) $(OPTFLAGS) DEFINEFLAGS:=-DMAKE -DPATCHLEVEL=$(PATCHLEVEL) $(OPTFLAGS)
BUILDFLAGS:=$(DEFINEFLAGS) $(WARNINGS) -ihledger-lib PREFERMACUSRLIBFLAGS=-L/usr/lib
BUILDFLAGS:=$(PREFERMACUSRLIBFLAGS) $(DEFINEFLAGS) $(WARNINGS) -ihledger-lib
TIME:=$(shell date +"%Y%m%d%H%M") TIME:=$(shell date +"%Y%m%d%H%M")
# file defining the current release version # file defining the current release version
@ -336,7 +337,7 @@ cleansite: site/hakyll
cd site; ./hakyll clean cd site; ./hakyll clean
site/hakyll: site/hakyll.hs site/hakyll: site/hakyll.hs
cd site; ghc --make hakyll.hs cd site; ghc --make hakyll.hs $(PREFERMACUSRLIBFLAGS)
viewsite: site viewsite: site
$(VIEWHTML) site/_site/index.html $(VIEWHTML) site/_site/index.html