X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=make%2Flilypond-vars.make;h=4faeb8fcd582d838515110355ec0e06388791969;hb=6140c6eb657080939fa4aef3d00d717bd85b5028;hp=6096bfb790c78d417a80faa58e18577bd08181d0;hpb=84ffce17397eb800a4744af7dcc8c4fff7dafe57;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 6096bfb790..4faeb8fcd5 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -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
 
@@ -15,6 +15,8 @@ else
 export LILYPOND_BINARY=$(LILYPOND_EXTERNAL_BINARY)
 endif
 
+LANGS=$(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
+
 export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
 
 the-script-dir=$(wildcard $(script-dir))
@@ -24,14 +26,36 @@ 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)/regression/ -I $(input-dir)/manual/ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/  -I $(top-build-dir)/mf/out/ -I $(input-dir)/lsr/
+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
 
 ## override from cmd line to speed up. 
 ANTI_ALIAS_FACTOR=2
 LILYPOND_JOBS=$(if $(CPU_COUNT),-djob-count=$(CPU_COUNT),)
-LANG_TEXIDOC_FLAG=$(if $(ISOLANG),--header=texidoc$(ISOLANG),)
-LILYPOND_BOOK_LILYPOND_FLAGS=-dbackend=eps --formats=ps,png,pdf $(LILYPOND_JOBS) -dinclude-eps-fonts -dgs-load-fonts --header=texidoc $(LANG_TEXIDOC_FLAG) -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=$(ANTI_ALIAS_FACTOR)
+LANG_TEXIDOC_FLAGS:=$(foreach lang,$(LANGS),--header=texidoc$(lang))
+LANG_DOCTITLE_FLAGS:=$(foreach lang,$(LANGS),--header=doctitle$(lang))
+
+LILYPOND_BOOK_LILYPOND_FLAGS=-dbackend=eps \
+--formats=ps,png,pdf \
+$(LILYPOND_JOBS) \
+-dinclude-eps-fonts \
+-dgs-load-fonts \
+--header=doctitle \
+$(LANG_DOCTITLE_FLAGS) \
+--header=texidoc \
+$(LANG_TEXIDOC_FLAGS) \
+-dcheck-internal-types \
+-ddump-signatures \
+-danti-alias-factor=$(ANTI_ALIAS_FACTOR)
+
+ifdef QUIET_BUILD
+LILYPOND_BOOK_VERBOSE =
+else
 LILYPOND_BOOK_VERBOSE = --verbose
+endif
+
 LILYPOND_BOOK_INFO_IMAGES_DIR = $(if $(INFO_IMAGES_DIR),--info-images-dir=$(INFO_IMAGES_DIR),)
 LILYPOND_BOOK_FLAGS = $(LILYPOND_BOOK_VERBOSE) $(LILYPOND_BOOK_INFO_IMAGES_DIR)
 
@@ -48,8 +72,10 @@ endif
 TEXINPUTS=$(top-src-dir)/tex/::
 export TEXINPUTS
 
+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