hard link git-annex to fix ./git-annex test
2fc46e1871
broke running ./git-annex test
when git-annex-shell is not in PATH from another install, and also
caused the wrong git-annex-shell to be tested.
Using a symlink made programPath return the .cabal/ directory where the
git-annex binary is, but git-annex-shell is not in that directory.
Changing to a hard link avoids that problem.
Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
parent
5b6518d4a3
commit
9770fde5f4
1 changed files with 3 additions and 3 deletions
6
Makefile
6
Makefile
|
@ -57,12 +57,12 @@ dev:
|
|||
git-annex: tmp/configure-stamp
|
||||
$(BUILDER) build $(BUILDERCOMMONOPTIONS) $(BUILDEROPTIONS)
|
||||
@if [ "$(BUILDER)" = stack ]; then \
|
||||
ln -sf $$(stack path $(BUILDERCOMMONOPTIONS) --dist-dir)/build/git-annex/git-annex git-annex; \
|
||||
ln -f $$(stack path $(BUILDERCOMMONOPTIONS) --dist-dir)/build/git-annex/git-annex git-annex; \
|
||||
else \
|
||||
if [ -d dist-newstyle ]; then \
|
||||
ln -sf $$(cabal exec -- sh -c 'command -v git-annex') git-annex; \
|
||||
ln -f $$(cabal exec -- sh -c 'command -v git-annex') git-annex; \
|
||||
else \
|
||||
ln -sf dist/build/git-annex/git-annex git-annex; \
|
||||
ln -f dist/build/git-annex/git-annex git-annex; \
|
||||
fi; \
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue