X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=elisp%2FGNUmakefile;h=9dcdf1ce6ed158339f0473176400d5a64078f3e5;hb=6f5ed410ccf2dc8147119e4ba3543b6e05653a8c;hp=8a0344f73b5ce4c1a9da1878ba258dfee557b505;hpb=5e738a5fbbccd3b1cf56976f103633109d584d3c;p=lilypond.git

diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile
index 8a0344f73b..9dcdf1ce6e 100644
--- a/elisp/GNUmakefile
+++ b/elisp/GNUmakefile
@@ -1,25 +1,29 @@
 depth = ..
 
-elispdir = $(datadir)/emacs/site-lisp
+# elispdir defined in config.make
 
 INSTALLATION_DIR=$(elispdir)
 INSTALLATION_FILES=$(EL_FILES)
 
 INSTALLATION_OUT_DIR=$(elispdir)
-INSTALLATION_OUT_FILES=$(outdir)/lilypond.words.el
+INSTALLATION_OUT_FILES=$(outdir)/lilypond-words.el
 
 STEPMAKE_TEMPLATES=elisp install install-out
+EXTRA_DIST_FILES= emacsclient.patch server.el.patch 
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
-LILYPOND_WORDS = $(outdir)/lilypond.words.el $(outdir)/lilypond.words.vim
+LILYPOND_WORDS = $(outdir)/lilypond-words.el
 LILYPOND_WORDS_DEPENDS =\
-  $(topdir)/lily/my-lily-lexer.cc \
-  $(buildscript-dir)/lilypond.words.py \
-  $(topdir)/scm/new-markup.scm \
-  $(topdir)/ly/engraver-init.ly
+  $(top-src-dir)/lily/lily-lexer.cc \
+  $(buildscript-dir)/lilypond-words \
+  $(top-src-dir)/scm/markup.scm \
+  $(top-src-dir)/ly/engraver-init.ly
 
-$(LILYPOND_WORDS): 
-	cd $(topdir) && $(PYTHON) buildscripts/lilypond.words.py $(builddir)/elisp/$(outconfbase)
+$(buildscript-dir)/lilypond-words:
+	make -C $(depth)/scripts/build
+
+$(LILYPOND_WORDS):
+	cd $(top-src-dir) && $(buildscript-dir)/lilypond-words --el --dir=$(top-build-dir)/elisp/$(outconfbase)
 
 all: $(LILYPOND_WORDS)