X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=vim%2FGNUmakefile;h=fd82e40164ae545679ce9529ece1f13285148b3c;hb=573e4186100cdcb8e3c3076bab742c9ae8be7696;hp=565b7c80e640e1e40723a847e487c416aa9471ed;hpb=078703a6ab29f75983a55ac2cc35fe5f315da574;p=lilypond.git

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index 565b7c80e6..fd82e40164 100644
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -4,7 +4,7 @@ INSTALLATION_OUT_DIR=$(vimdir)/syntax
 INSTALLATION_OUT_FILES=$(LILYPOND_WORDS)
 # $(outdir)/lilypond-words $(outdir)/lilypond-words.el
 
-EXTRA_DIST_FILES=$(wildcard *.vim) vimrc
+EXTRA_DIST_FILES=$(call src-wildcard,*.vim) vimrc
 
 LILYPOND_WORDS = $(outdir)/lilypond-words $(outdir)/lilypond-words.vim
 LILYPOND_WORDS_DEPENDS =\
@@ -16,41 +16,22 @@ LILYPOND_WORDS_DEPENDS =\
 STEPMAKE_TEMPLATES=install-out
 
 # vimdir defined in config.make
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 local-install:
-	-$(INSTALL) -d $(DESTDIR)$(vimdir)/compiler
-	$(INSTALL) -m 644 lilypond-compiler.vim $(DESTDIR)$(vimdir)/compiler/lilypond.vim
-
-	-$(INSTALL) -d $(DESTDIR)$(vimdir)/ftdetect
-	$(INSTALL) -m 644 lilypond-ftdetect.vim $(DESTDIR)$(vimdir)/ftdetect/lilypond.vim
-
-	-$(INSTALL) -d $(DESTDIR)$(vimdir)/ftplugin
-	$(INSTALL) -m 644 lilypond-ftplugin.vim $(DESTDIR)$(vimdir)/ftplugin/lilypond.vim
-
-	-$(INSTALL) -d $(DESTDIR)$(vimdir)/indent
-	$(INSTALL) -m 644 lilypond-indent.vim $(DESTDIR)$(vimdir)/indent/lilypond.vim
-
-	-$(INSTALL) -d $(DESTDIR)$(vimdir)/syntax
-	$(INSTALL) -m 644 lilypond-syntax.vim $(DESTDIR)$(vimdir)/syntax/lilypond.vim
+	for a in compiler ftdetect ftplugin indent syntax; do \
+		$(INSTALL) -d $(DESTDIR)$(vimdir)/$$a \
+		&& $(INSTALL) -m 644 $(src-dir)/lilypond-$$a.vim $(DESTDIR)$(vimdir)/$$a/lilypond.vim ; \
+	done
 
 local-uninstall:
-	rm $(DESTDIR)$(vimdir)/compiler/lilypond.vim
-	-rmdir -p $(DESTDIR)$(vimdir)/compiler 
-
-	rm $(DESTDIR)$(vimdir)/ftdetect/lilypond.vim
-	-rmdir -p $(DESTDIR)$(vimdir)/ftdetect 
-
-	rm $(DESTDIR)$(vimdir)/ftplugin/lilypond.vim
-	-rmdir -p $(DESTDIR)$(vimdir)/ftplugin 
-
-	rm $(DESTDIR)$(vimdir)/indent/lilypond.vim
-	-rmdir -p $(DESTDIR)$(vimdir)/indent 
-
-	rm $(DESTDIR)$(vimdir)/syntax/lilypond.vim
-	-rmdir -p $(DESTDIR)$(vimdir)/syntax
+	for a in compiler ftdetect ftplugin indent syntax; do \
+		rm $(DESTDIR)$(vimdir)/$$a/lilypond.vim ; \
+		rmdir $(DESTDIR)$(vimdir)/$$a; \
+	done
+	-rmdir -p $(DESTDIR)$(vimdir)
 
-$(LILYPOND_WORDS): 
+$(LILYPOND_WORDS):
 	cd $(top-src-dir) && $(PYTHON) buildscripts/lilypond-words.py --words --vim --dir=$(top-build-dir)/vim/$(outconfbase)
 
 all: $(LILYPOND_WORDS)