aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-09 02:28:49 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-09 02:28:49 +1200
commit576505dba94005662b8fd1293ab0d1a33d8e396d (patch)
tree2fa3fdc34638a3ce1dc70fe5d675c87f076e56f4
parent4054ecb07c13954fa3f74092bb09ce1b72711537 (diff)
downloaddotfiles-576505dba94005662b8fd1293ab0d1a33d8e396d.tar.gz
Specify which Vim to run in Makefile
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4556ceae..c879db4c 100644
--- a/Makefile
+++ b/Makefile
@@ -492,6 +492,7 @@ install-urxvt: urxvt/ext/select
find urxvt/ext -type f ! -name '*.pl' \
-exec cp -p -- {} $(HOME)/.urxvt/ext \;
+VIM = vim
VIMDIR = $(HOME)/.vim
VIMRC = $(HOME)/.vimrc
@@ -507,6 +508,7 @@ install-vim: install-vim-after \
install-neovim:
make install-vim \
+ VIM=nvim \
VIMDIR=$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim \
VIMRC=$${XDF_CONFIG_HOME:="$$HOME"/.config}/init.vim
@@ -542,7 +544,7 @@ install-vim-bundle: install-vim-config
find vim/bundle/*/*/* \
-type f -exec sh -c \
'cp -p -- "$$1" $(VIMDIR)/"$${1#vim/bundle/*/}"' _ {} \;
- vim -e -u NONE -c 'helptags $(VIMDIR)/doc' -c quit
+ $(VIM) -e -u NONE -c 'helptags $(VIMDIR)/doc' -c quit
install-vim-compiler:
mkdir -p -- $(VIMDIR)/compiler