X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=4faeb8fcd582d838515110355ec0e06388791969;hb=6140c6eb657080939fa4aef3d00d717bd85b5028;hp=2736eb5069cb65c2441bd5775af114c162984d5c;hpb=d22db549aa92d8cc919ec58e62dc60d4b5b0a4d7;p=lilypond.git diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 2736eb5069..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 @@ -50,7 +50,12 @@ $(LANG_TEXIDOC_FLAGS) \ -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) @@ -72,5 +77,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