Avoid using runghc when building the Debian package, as that needs ghci.
This commit is contained in:
parent
5fe6c4d96b
commit
1112628cdf
3 changed files with 6 additions and 3 deletions
6
Makefile
6
Makefile
|
@ -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
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
2
debian/rules
vendored
2
debian/rules
vendored
|
@ -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 $@
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue