Merge branch 'master' into nested-bookparts

[lilypond.git] / vim / GNUmakefile

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index a52855eae95d543b502626546bb3382d0bdba750..fd82e40164ae545679ce9529ece1f13285148b3c 100644 (file)
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -4,54 +4,35 @@ 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 =\
-  $(topdir)/lily/my-lily-lexer.cc \
+  $(top-src-dir)/lily/lily-lexer.cc \
   $(buildscript-dir)/lilypond-words.py \
-  $(topdir)/scm/new-markup.scm \
-  $(topdir)/ly/engraver-init.ly
+  $(top-src-dir)/scm/markup.scm \
+  $(top-src-dir)/ly/engraver-init.ly
 
 STEPMAKE_TEMPLATES=install-out
 
 # vimdir defined in config.make
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 local-install:
-       mkdir -p $(vimdir)/compiler
-       $(INSTALL) lilypond-compiler.vim $(vimdir)/compiler/lilypond.vim
-
-       mkdir -p $(vimdir)/ftdetect
-       $(INSTALL) lilypond-ftdetect.vim $(vimdir)/ftdetect/lilypond.vim
-
-       mkdir -p $(vimdir)/ftplugin
-       $(INSTALL) lilypond-ftplugin.vim $(vimdir)/ftplugin/lilypond.vim
-
-       mkdir -p $(vimdir)/indent
-       $(INSTALL) lilypond-indent.vim $(vimdir)/indent/lilypond.vim
-
-       mkdir -p $(vimdir)/syntax
-       $(INSTALL) lilypond-syntax.vim $(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 $(vimdir)/compiler/lilypond.vim
-       rmdir -p $(vimdir)/compiler 
-
-       rm $(vimdir)/ftdetect/lilypond.vim
-       rmdir -p $(vimdir)/ftdetect 
-
-       rm $(vimdir)/ftplugin/lilypond.vim
-       rmdir -p $(vimdir)/ftplugin 
-
-       rm $(vimdir)/indent/lilypond.vim
-       rmdir -p $(vimdir)/indent 
-
-       rm $(vimdir)/syntax/lilypond.vim
-       rmdir -p $(vimdir)/syntax
-
-$(LILYPOND_WORDS): 
-       cd $(topdir) && $(PYTHON) buildscripts/lilypond-words.py --words --vim --dir=$(builddir)/vim/$(outconfbase)
+       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):
+       cd $(top-src-dir) && $(PYTHON) buildscripts/lilypond-words.py --words --vim --dir=$(top-build-dir)/vim/$(outconfbase)
 
 all: $(LILYPOND_WORDS)