aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-10-30 11:54:12 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-10-30 11:54:12 +1300
commit49c25f7100b7dfdbfe354a21551300f666691f00 (patch)
tree2e4d56bbbf0a10c125d691fe220bbadf0cdbbfc3 /Makefile
parentMove vim/after/ftplugin files into vim/ftplugin (diff)
downloaddotfiles-49c25f7100b7dfdbfe354a21551300f666691f00.tar.gz
dotfiles-49c25f7100b7dfdbfe354a21551300f666691f00.zip
Remove vim/after installation from vim/bundle
The `install-vim-bundle` target shouldn't also be installing files in vim/after; move that out into a separate target. We have to use a couple of find(1) calls rather than a simple glob copy like e.g. `install-vim-config`, because it's a multi-level hierarchy. At present however there are only vim/after/syntax files left, which I am pretty sure do actually need to run after the core syntax files are loaded in order to correct or repair things I don't like.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 455a69d4..01e58ba8 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@
install-tmux \
install-urxvt \
install-vim \
+ install-vim-after \
install-vim-bundle \
install-vim-config \
install-vim-ftdetect \
@@ -465,14 +466,20 @@ install-urxvt: urxvt/ext/select
find urxvt/ext -type f ! -name '*.pl' \
-exec cp -p -- {} $(HOME)/.urxvt/ext \;
-install-vim: install-vim-bundle \
+install-vim: install-vim-after \
+ install-vim-bundle \
install-vim-config \
install-vim-ftdetect \
install-vim-ftplugin \
install-vim-indent
+install-vim-after:
+ find vim/after -name .git -prune -o \
+ -type d -exec sh -c 'mkdir -p -- $(HOME)/."$$1"' _ {} \; -o \
+ -type f -exec sh -c 'cp -p -- "$$1" $(HOME)/."$$1"' _ {} \;
+
install-vim-bundle: install-vim-config
- find vim/after vim/bundle -name .git -prune -o \
+ find vim/bundle -name .git -prune -o \
-type d -exec sh -c 'mkdir -p -- $(HOME)/."$$1"' _ {} \; -o \
-type f -exec sh -c 'cp -p -- "$$1" $(HOME)/."$$1"' _ {} \;