diff --git a/Makefile.orig b/Makefile index e5bfdfeee6d..feae8e7cb4b 100644 --- a/Makefile.orig +++ b/Makefile @@ -5,7 +5,7 @@ BUILDER?=cabal ifeq ($(BUILDER),stack) GHC?=stack ghc -- else -GHC?=ghc +GHC?=cabal exec ghc -- endif PREFIX?=/usr @@ -90,17 +90,17 @@ install-docs: docs install-mans rsync -a --delete html/ $(DESTDIR)$(PREFIX)/$(SHAREDIR)/doc/git-annex/html/; \ fi -install-bins: build +install-bins: install -d $(DESTDIR)$(PREFIX)/bin install git-annex $(DESTDIR)$(PREFIX)/bin ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-annex-shell ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-remote-annex ln -sf git-annex $(DESTDIR)$(PREFIX)/bin/git-remote-tor-annex -install-desktop: build Build/InstallDesktopFile +install-desktop: Build/InstallDesktopFile ./Build/InstallDesktopFile $(PREFIX)/bin/git-annex || true -install-completions: build +install-completions: install -d $(DESTDIR)$(PREFIX)/$(SHAREDIR)/bash-completion/completions install -m 0644 bash-completion.bash $(DESTDIR)$(PREFIX)/$(SHAREDIR)/bash-completion/completions/git-annex install -d $(DESTDIR)$(ZSH_COMPLETIONS_PATH)