diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-28 16:08:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-28 16:08:11 -0400 |
| commit | 9d8240b15a32f230d1258273f8d30ee22367911b (patch) | |
| tree | b9eddea6a760da2908fdabdd4d8e04e6b05f6ee7 /Makefile | |
| parent | 970721dc4a1a8ce2a49608561667ca23c10d66ad (diff) | |
use Setup.hs rather than depending on cabal-install
Based on a patch from Peter Simons
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -4,6 +4,7 @@ all=git-annex $(mans) docs GHC?=ghc GHCMAKE=$(GHC) $(GHCFLAGS) --make PREFIX=/usr +CABAL=runhaskell Setup.hs # Am I typing :make in vim? Do a fast build. ifdef VIM @@ -19,14 +20,14 @@ fast: dist/caballog @ln -sf dist/build/git-annex/git-annex git-annex dist/caballog: - cabal configure -f"-Production" -O0 - cabal build -v2 | tee $@ + $(CABAL) configure -f"-Production" -O0 + $(CABAL) build -v2 | tee $@ Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs - cabal configure + $(CABAL) configure git-annex: Build/SysConfig.hs - cabal build + $(CABAL) build ln -sf dist/build/git-annex/git-annex git-annex git-annex.1: doc/git-annex.mdwn @@ -154,7 +155,7 @@ osxapp: # Cross compile for Android. # Uses https://github.com/neurocyte/ghc-android android: - cabal configure + $(CABAL) configure # cabal cannot cross compile with custom build type, so workaround sed -i 's/Build-type: Custom/Build-type: Simple/' git-annex.cabal $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f'Android Assistant -Pairing -Webapp' |