Issue 5167/6: Changes: show \markup xxx = ... \etc assignments

[lilypond.git] / vim / GNUmakefile

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index 76efcaa6934be851e5fd197c20c9fa6de70fed6b..ad032e42fe75d5542147a7dd6e756e9557ace988 100644 (file)
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -9,30 +9,33 @@ EXTRA_DIST_FILES=$(call src-wildcard,*.vim) vimrc
 LILYPOND_WORDS = $(outdir)/lilypond-words $(outdir)/lilypond-words.vim
 LILYPOND_WORDS_DEPENDS =\
   $(top-src-dir)/lily/lily-lexer.cc \
-  $(buildscript-dir)/lilypond-words.py \
+  $(buildscript-dir)/lilypond-words \
   $(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:
        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
-       $(INSTALL) -m 644 lilypond-syntax.vim $(DESTDIR)$(vimdir)/syntax/lilypond.vim
 
 local-uninstall:
        for a in compiler ftdetect ftplugin indent syntax; do \
                rm $(DESTDIR)$(vimdir)/$$a/lilypond.vim ; \
-               -rmdir -p $(DESTDIR)$(vimdir)/$$a ; \
+               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)
+$(buildscript-dir)/lilypond-words:
+       make -C $(depth)/scripts/build
+
+$(LILYPOND_WORDS):
+       cd $(top-src-dir) && $(buildscript-dir)/lilypond-words --words --vim --dir=$(top-build-dir)/vim/$(outconfbase)
 
 all: $(LILYPOND_WORDS)