summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Nathan Collins <nathan.collins@gmail.com>2012-06-12 02:36:05 -0700
committerGravatar Nathan Collins <nathan.collins@gmail.com>2012-06-12 02:36:05 -0700
commit79a71d9ba68818a62cbf96f3cf46d01ac662f836 (patch)
tree41b1f51333a8232aeb0f0ef231d8b422106c8da2 /Makefile
parent72b0054931cd0d41477fa7270154cb53d8e94e4d (diff)
Simplify git-annex.cabal and generate sdist with make-sdist.sh.
The `cabal install` is happy as long as the files it needs are present, but `cabal sdist` will only package up files you tell it to. So, generate the source tarball ourselves. The source tarball is generated by make-sdist.sh, which uses cabal sdist to calculate the package name. Could also generate the name from the 'Version:' field in git-annex.cabal.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 4 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index ca9ea2036..d23f08a7d 100644
--- a/Makefile
+++ b/Makefile
@@ -98,20 +98,12 @@ docs: $(mans)
clean:
rm -rf tmp $(bins) $(mans) test configure *.tix .hpc $(sources) \
- doc/.ikiwiki html dist $(clibs) git-annex.cabal
+ doc/.ikiwiki html dist $(clibs)
-# Workaround for cabal sdist not running Setup hooks, so I cannot
-# generate a file list there.
+# Workaround for `cabal sdist` requiring all included files to be listed
+# in .cabal.
sdist: clean $(mans)
- # Could make this a .PHONY, but it needs to be rerun each time,
- # unless we want to list a *lot* of dependencies.
- ./git-annex.cabal.template.sh > git-annex.cabal
- # Complains about not running 'configure' first, but adding
- #
- # cabal configure
- #
- # does not help.
- cabal sdist
+ ./make-sdist.sh
# Upload to hackage.
hackage: sdist