X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=vim%2FGNUmakefile;h=ad032e42fe75d5542147a7dd6e756e9557ace988;hb=a26d69cbc5f9bdc3064d97223bc8f8f8936a9938;hp=315cc4530f45c6e5cfdbd138252fe10ecc4739b1;hpb=45e6609a6294f50b631fda3e65dbf7698b2114b3;p=lilypond.git

diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index 315cc4530f..ad032e42fe 100644
--- 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 $(srcdir)/lilypond-$$a.vim $(DESTDIR)$(vimdir)/$$a/lilypond.vim ; \
+		&& $(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)