diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -4,7 +4,7 @@ all=git-annex $(mans) docs GHC?=ghc GHCMAKE=$(GHC) $(GHCFLAGS) --make PREFIX=/usr -CABAL?=cabal # set to "runghc Setup.hs" if you lack a cabal program +CABAL?=cabal # set to "./Setup" if you lack a cabal program # Am I typing :make in vim? Do a fast build. ifdef VIM @@ -16,6 +16,7 @@ build-stamp: $(all) touch $@ Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs + if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi $(CABAL) configure git-annex: Build/SysConfig.hs @@ -71,7 +72,8 @@ docs: $(mans) clean: rm -rf tmp dist git-annex $(mans) configure *.tix .hpc \ - doc/.ikiwiki html dist tags Build/SysConfig.hs build-stamp + doc/.ikiwiki html dist tags Build/SysConfig.hs build-stamp \ + Setup.hi Setup.o Setup sdist: clean $(mans) ./Build/make-sdist.sh diff --git a/debian/changelog b/debian/changelog index 57f7223ae..2650ba0ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ git-annex (4.20130406) UNRELEASED; urgency=low * Adjust preferred content expressions so that content in archive directories is preferred until it has reached an archive or smallarchive repository. + * Avoid using runghc when building the Debian package, as that needs ghci. -- Joey Hess <joeyh@debian.org> Sat, 06 Apr 2013 15:24:15 -0400 diff --git a/debian/rules b/debian/rules index 99bcd6aa0..a0231eb60 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f # Avoid using cabal, as it writes to $HOME -export CABAL=runghc Setup.hs +export CABAL=./Setup %: dh $@ |