diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-11-11 15:01:55 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-11-11 15:02:25 -0400 |
| commit | fc35e5f3a3b932e615b3e15eceb2c3a3da2be098 (patch) | |
| tree | dc4005e864faa99167e292b2b5ae9d4bbcb9cd55 | |
| parent | 962e279e17c1f3cf3be49ffdfb5e7310711a220c (diff) | |
| download | git-repair-fc35e5f3a3b932e615b3e15eceb2c3a3da2be098.tar.gz | |
sync makefile with git-annex's
* Makefile: Support building with stack as well as cabal.
* Makefile: The CABAL variable has been renamed to BUILDER.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | Makefile | 23 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 20 insertions, 7 deletions
@@ -6,6 +6,8 @@ git-repair (1.20161111) unstable; urgency=medium it is NOT the full git-repair source tree. * debian/changelog: Converted to symlinks to CHANGELOG. * Merge from git-annex. + * Makefile: Support building with stack as well as cabal. + * Makefile: The CABAL variable has been renamed to BUILDER. -- Joey Hess <id@joeyh.name> Fri, 11 Nov 2016 14:56:14 -0400 @@ -1,14 +1,25 @@ +# set to "./Setup" if you lack a cabal program. Or can be set to "stack" +BUILDER?=cabal +GHC?=ghc + PREFIX=/usr -CABAL?=cabal # set to "./Setup" if you lack a cabal program build: Build/SysConfig.hs - $(CABAL) build - ln -sf dist/build/git-repair/git-repair git-repair + $(BUILDER) build $(BUILDEROPTIONS) + if [ "$(BUILDER)" = stack ]; then \ + ln -sf $$(find .stack-work/ -name git-repair -type f | grep build/git-annex/git-repair | tail -n 1) git-repair; \ + else \ + ln -sf dist/build/git-repair/git-repair git-repair; \ + fi @$(MAKE) tags >/dev/null 2>&1 & -Build/SysConfig.hs: configure.hs Build/TestConfig.hs Build/Configure.hs - if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi - $(CABAL) configure --ghc-options="$(shell Build/collect-ghc-options.sh)" +Build/SysConfig.hs: Build/TestConfig.hs Build/Configure.hs + if [ "$(BUILDER)" = ./Setup ]; then ghc --make Setup; fi + if [ "$(BUILDER)" = stack ]; then \ + $(BUILDER) build $(BUILDEROPTIONS); \ + else \ + $(BUILDER) configure --ghc-options="$(shell Build/collect-ghc-options.sh)"; \ + fi install: build install -d $(DESTDIR)$(PREFIX)/bin diff --git a/debian/rules b/debian/rules index 4d8fa21..9198916 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=./Setup +export BUILDER=./Setup # Do use the changelog's version number, rather than making one up. export RELEASE_BUILD=1 |