From 65f428ff3032186d066accd895cef64fc5836fb4 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 6 Jun 2020 20:42:42 +1200
Subject: Drastically simplify Vim installation target

---
 Makefile | 112 +++++++++++----------------------------------------------------
 1 file changed, 19 insertions(+), 93 deletions(-)

diff --git a/Makefile b/Makefile
index c1319139..eec006cf 100644
--- a/Makefile
+++ b/Makefile
@@ -46,21 +46,7 @@
 	install-tmux \
 	install-urxvt \
 	install-vim \
-	install-vim-after \
-	install-vim-after-ftplugin \
-	install-vim-after-indent \
-	install-vim-after-plugin \
-	install-vim-after-syntax \
-	install-vim-bundle \
-	install-vim-compiler \
-	install-vim-config \
-	install-vim-filetype \
-	install-vim-ftplugin \
 	install-vim-gui \
-	install-vim-gui-config \
-	install-vim-indent \
-	install-vim-plugin \
-	install-vim-syntax \
 	install-vint \
 	install-wget \
 	install-x \
@@ -605,90 +591,30 @@ VIM = vim
 VIMDIR = $(HOME)/.vim
 VIMRC = $(VIMDIR)/vimrc
 
-install-vim: install-vim-after \
-	install-vim-autoload \
-	install-vim-bundle \
-	install-vim-compiler \
-	install-vim-config \
-	install-vim-filetype \
-	install-vim-ftplugin \
-	install-vim-indent \
-	install-vim-plugin \
-	install-vim-syntax
-
-install-vim-after: install-vim-after-ftplugin \
-	install-vim-after-indent \
-	install-vim-after-plugin \
-	install-vim-after-syntax
-
-install-vim-after-ftplugin: install-vim-compiler
-	mkdir -p -- $(VIMDIR)/after/ftplugin
-	cp -p -- vim/after/ftplugin/*.vim $(VIMDIR)/after/ftplugin
-
-install-vim-after-indent: install-vim-autoload
-	mkdir -p -- $(VIMDIR)/after/indent
-	cp -p -- vim/after/indent/*.vim $(VIMDIR)/after/indent
-
-install-vim-after-plugin: install-vim-autoload
-	mkdir -p -- $(VIMDIR)/after/plugin
-	cp -p -- vim/after/plugin/*.vim $(VIMDIR)/after/plugin
-
-install-vim-after-syntax:
-	mkdir -p -- $(VIMDIR)/after/syntax
-	cp -p -- vim/after/syntax/*.vim $(VIMDIR)/after/syntax
-
-install-vim-autoload:
-	mkdir -p -- $(VIMDIR)/autoload
-	cd vim && find autoload \
-		-type d -exec sh -c \
-		'mkdir -p -- $(VIMDIR)/"$$1"' _ {} \; \
-		-o \
-		-type f -exec sh -c \
-		'cp -p -- "$$1" $(VIMDIR)/"$$1"' _ {} \;
-
-install-vim-bundle: install-vim-config
-	cd vim/bundle && find */* \
-		-type d -exec sh -c \
-		'mkdir -p -- $(VIMDIR)/"$${1#*/}"' _ {} \;
-	cd vim/bundle && find */*/* \
-		-type f -exec sh -c \
-		'cp -p -- "$$1" $(VIMDIR)/"$${1#*/}"' _ {} \;
-	$(VIM) -Esu install/helptags.vim
-
-install-vim-compiler:
-	mkdir -p -- $(VIMDIR)/compiler
-	cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler
-
-install-vim-config: install-vim-autoload
+install-vim:
+	mkdir -p -- $(VIMDIR)
 	cp -p -- vim/vimrc.stub $(HOME)/.vimrc
 	cp -p -- vim/vimrc $(VIMRC)
-
-install-vim-filetype:
-	cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR)
-
-install-vim-ftplugin: install-vim-autoload
-	mkdir -p -- $(VIMDIR)/ftplugin
-	cp -p -- vim/ftplugin/*.vim $(VIMDIR)/ftplugin
+	cp -p -- vim/filetype.vim \
+		vim/scripts.vim \
+		$(VIMDIR)
+	cp -pR -- vim/after \
+		vim/autoload \
+		vim/compiler \
+		vim/ftplugin \
+		vim/indent \
+		vim/plugin \
+		vim/syntax \
+		$(VIMDIR)
+	for ent in vim/bundle/*/* ; do \
+		[ -d "$$ent" ] || continue ; \
+		cp -pR -- "$$ent" $(VIMDIR) ; \
+	done
 
 GVIMRC = $(HOME)/.gvimrc
 
-install-vim-gui: install-vim \
-	install-vim-gui-config
-
-install-vim-gui-config:
-	cp -p -- vim/gvimrc $(GVIMRC)
-
-install-vim-indent:
-	mkdir -p -- $(VIMDIR)/indent
-	cp -p -- vim/indent/*.vim $(VIMDIR)/indent
-
-install-vim-plugin: install-vim-autoload
-	mkdir -p -- $(VIMDIR)/plugin
-	cp -p -- vim/plugin/*.vim $(VIMDIR)/plugin
-
-install-vim-syntax:
-	mkdir -p -- $(VIMDIR)/syntax
-	cp -p -- vim/syntax/*.vim $(VIMDIR)/syntax
+install-vim-gui: install-vim
+	cp -- vim/gvimrc $(GVIMRC)
 
 install-vint:
 	cp -p -- vint/vintrc.yaml $(HOME)/.vintrc.yaml
-- 
cgit v1.2.3