vim: simplify build

There should be no functional changes, except that you don't need to
make the directories before installing.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

diff --git a/vim/Makefile b/vim/Makefile
index 89e18be197dfa10e74c7e093603d01128d574672..f17bebfec9c1662e9c6117499d487fe7da12032e 100644 (file)
--- a/vim/Makefile
+++ b/vim/Makefile
@@ -1,11 +1,11 @@
 .PHONY: all help install link symlink
 
 .PHONY: all help install link symlink
 

-FILES     = plugin/notmuch.vim \
-           $(wildcard syntax/notmuch-*.vim)
+files = plugin/notmuch.vim \
+       $(wildcard syntax/notmuch-*.vim)
+prefix = $(HOME)/.vim
+destdir = $(prefix)/plugin

 
 

-PREFIX    = $(shell ls -d ~/.vim/)
-
-OUT_FILES = $(FILES:%=${PREFIX}/%)
+INSTALL = install -D -m644

 
 all: help
 
 
 all: help
 


@@ -16,9 +16,8 @@ help:
        @echo "    make install     - copy plugin scripts and syntax files to ~/.vim"
        @echo "    make symlink     - create symlinks in ~/.vim (useful for development)"
 
        @echo "    make install     - copy plugin scripts and syntax files to ~/.vim"
        @echo "    make symlink     - create symlinks in ~/.vim (useful for development)"
 

-install: ${OUT_FILES}
-link symlink:
-       ${MAKE} SYMLINK=1 install
+install:
+       @for x in $(files); do $(INSTALL) $(CURDIR)/$$x $(prefix)/$$x; done

 
 

-${OUT_FILES}: ${PREFIX}/%: %
-       $(if ${SYMLINK},ln -fs,cp) `pwd`/$< $@
+link symlink: INSTALL = ln -fs
+link symlink: install