]> git.donarmstrong.com Git - lilypond.git/blobdiff - make/lilypond-vars.make
Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...
[lilypond.git] / make / lilypond-vars.make
index 10b82d8d9fd78c8af991d68ae7b4c59f48bf6586..cf1bc11203487102b4c3bb39d569aae1445a81fc 100644 (file)
@@ -3,7 +3,7 @@
 ifeq ($(LILYPOND_EXTERNAL_BINARY),)
 
 # environment settings.
-export PATH:=$(top-build-dir)/lily/$(outconfbase):$(top-build-dir)/buildscripts/$(outconfbase):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
+export PATH:=$(top-build-dir)/lily/$(outconfbase):$(buildscript-dir):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
 export LILYPOND_BINARY=$(top-build-dir)/$(outconfbase)/bin/lilypond
 else
 
@@ -22,14 +22,18 @@ export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
 the-script-dir=$(wildcard $(script-dir))
 
 ABC2LY = $(script-dir)/abc2ly.py
+MIDI2LY = $(script-dir)/midi2ly.py
 MUSICXML2LY = $(script-dir)/musicxml2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
 
 LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir)   \
- -I $(input-dir)/lsr/ -I $(input-dir)/regression/ -I $(input-dir)/manual/ \
- -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/      \
- -I $(top-build-dir)/mf/out/ -I $(top-src-dir)/input/manual
+ -I $(top-src-dir)/Documentation -I $(top-src-dir)/Documentation/snippets \
+ -I $(input-dir)/regression/ -I $(top-src-dir)/Documentation/included/ \
+ -I $(top-build-dir)/mf/$(outconfbase)/        \
+ -I $(top-build-dir)/mf/out/ \
+ -I $(top-src-dir)/Documentation/pictures \
+ -I $(top-build-dir)/Documentation/pictures/$(outdir)
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2
@@ -77,5 +81,5 @@ export LYDOC_LOCALEDIR:= $(top-build-dir)/Documentation/po/out-www
 #texi-html for www only:
 LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
 LY2DVI = $(LILYPOND_BINARY)
-LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
+LYS_TO_TELY = $(buildscript-dir)/lys-to-tely