summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 9 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index d2cd567..ddb440b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,15 @@ PREFIX=/usr
build: Build/SysConfig.hs
$(BUILDER) build $(BUILDEROPTIONS)
if [ "$(BUILDER)" = stack ]; then \
- ln -sf $$(stack path --dist-dir)/build/git-annex/git-repair git-repair; \
+ ln -sf $$(stack path --dist-dir)/build/git-repair/git-repair git-repair; \
else \
- ln -sf dist/build/git-repair/git-repair git-repair; \
+ if [ -d dist-newstyle ]; then \
+ ln -sf $$(cabal exec -- sh -c 'command -v git-repair') git-repair; \
+ else \
+ ln -sf dist/build/git-repair/git-repair git-repair; \
+ fi; \
fi
- @$(MAKE) tags >/dev/null 2>&1 &
+ @$(MAKE) tags
Build/SysConfig.hs: Build/TestConfig.hs Build/Configure.hs
if [ "$(BUILDER)" = ./Setup ]; then ghc --make Setup; fi
@@ -29,12 +33,11 @@ install: build
clean:
rm -rf git-repair git-repair-test.log \
- dist configure Build/SysConfig.hs Setup tags
+ dist dist-newstyle configure Build/SysConfig.hs Setup tags
find . -name \*.o -exec rm {} \;
find . -name \*.hi -exec rm {} \;
-# hothasktags chokes on some template haskell etc, so ignore errors
tags:
- (for f in $$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$'); do hothasktags -c --cpp -c -traditional -c --include=dist/build/autogen/cabal_macros.h $$f; done) 2>/dev/null | sort > tags
+ hasktags . -c || true
.PHONY: tags