X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=1fd163caa174dec5cf62a6fac438266049a219b1;hb=HEAD;hp=69a863bdc89a6902482a0286e3220d4e6de1d696;hpb=2d52187d5492ce7492c78fc8f1dca4aa7b702ba0;p=lilypond.git diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 69a863bdc8..1fd163caa1 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -27,13 +27,7 @@ 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 $(top-src-dir)/Documentation -I $(top-build-dir)/Documentation/snippets/out \ - -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) +LILYPOND_BOOK_INCLUDES = -I $(src-dir) $(DOCUMENTATION_INCLUDES) ## override from cmd line to speed up. ANTI_ALIAS_FACTOR=2 @@ -54,6 +48,12 @@ $(LANG_TEXIDOC_FLAGS) \ -ddump-signatures \ -danti-alias-factor=$(ANTI_ALIAS_FACTOR) +ifeq ($(USE_EXTRACTPDFMARK),yes) +LILYPOND_BOOK_LILYPOND_FLAGS+= \ +-dfont-export-dir=$(top-build-dir)/out-fonts \ +-dgs-never-embed-fonts +endif + ifdef QUIET_BUILD LILYPOND_BOOK_WARN = --loglevel=NONE else @@ -75,6 +75,8 @@ endif TEXINPUTS=$(top-src-dir)/tex/:: export TEXINPUTS +TEXFONTMAPS=$(top-build-dir)/tex/$(outdir):: +export TEXFONTMAPS export LYDOC_LOCALEDIR:= $(top-build-dir)/Documentation/po/out-www