Merge branch 'master' of /home/lilycvs/git/lily/

[lilypond.git] / make / lilypond-vars.make

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 5cbd5537cbe6df52998f95d5ca452ad711197d83..7fa9aa9ab3f222dee7bddbbb27568213651716f0 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -37,7 +37,7 @@ LILYPOND_BOOK_FLAGS = $(LILYPOND_BOOK_VERBOSE) $(LILYPOND_BOOK_INFO_IMAGES_DIR)
 
 ifeq ($(out),)
 LILYPOND_BOOK_PROCESS = true
-LILYPOND_BOOK_FLAGS += --no-lily-run
+LILYPOND_BOOK_FLAGS += --skip-lily-check
 else
 LILYPOND_BOOK_PROCESS = $(LILYPOND_BINARY)
 endif
@@ -48,6 +48,8 @@ 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)