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

use Setup.hs rather than depending on cabal-install

Browse source 
Based on a patch from Peter Simons
This commit is contained in:
Joey Hess 2013-02-28 16:08:11 -04:00
parent 39e29f7178
commit 843df51f06
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -4,6 +4,7 @@ all=git-annex $(mans) docs
GHC?=ghc GHC?=ghc
GHCMAKE=$(GHC) $(GHCFLAGS) --make GHCMAKE=$(GHC) $(GHCFLAGS) --make
PREFIX=/usr PREFIX=/usr
CABAL=runhaskell Setup.hs
# Am I typing :make in vim? Do a fast build. # Am I typing :make in vim? Do a fast build.
ifdef VIM ifdef VIM
@ -19,14 +20,14 @@ fast: dist/caballog
@ln -sf dist/build/git-annex/git-annex git-annex @ln -sf dist/build/git-annex/git-annex git-annex
dist/caballog: dist/caballog:
cabal configure -f"-Production" -O0 $(CABAL) configure -f"-Production" -O0
cabal build -v2 | tee $@ $(CABAL) build -v2 | tee $@
Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs
cabal configure $(CABAL) configure
git-annex: Build/SysConfig.hs git-annex: Build/SysConfig.hs
cabal build $(CABAL) build
ln -sf dist/build/git-annex/git-annex git-annex ln -sf dist/build/git-annex/git-annex git-annex
git-annex.1: doc/git-annex.mdwn git-annex.1: doc/git-annex.mdwn
@ -154,7 +155,7 @@ osxapp:
# Cross compile for Android. # Cross compile for Android.
# Uses https://github.com/neurocyte/ghc-android # Uses https://github.com/neurocyte/ghc-android
android: android:
cabal configure $(CABAL) configure
# cabal cannot cross compile with custom build type, so workaround # cabal cannot cross compile with custom build type, so workaround
sed -i 's/Build-type: Custom/Build-type: Simple/' git-annex.cabal 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' $$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin/cabal configure -f'Android Assistant -Pairing -Webapp'

1
debian/control vendored
View file

@ -4,7 +4,6 @@ Priority: optional
Build-Depends: Build-Depends:
debhelper (>= 9), debhelper (>= 9),
ghc (>= 7.4), ghc (>= 7.4),
cabal-install,
libghc-mtl-dev (>= 2.1.1), libghc-mtl-dev (>= 2.1.1),
libghc-missingh-dev, libghc-missingh-dev,
libghc-hslogger-dev, libghc-hslogger-dev,