Merge branch 'master' into nested-bookparts

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

diff --git a/make/ly-vars.make b/make/ly-vars.make
index c566ce6e89388848967316c40cc3b5f4e412b9b9..498ad1ffa587281b2c072e2905b716a3c10abfc0 100644 (file)
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -4,6 +4,8 @@
 
 # huh ? these are for documentation?!
 TELY_FILES := $(call src-wildcard,*.tely)
+MASTER_TEXI_FILES := $(sort $(TELY_FILES:%.tely=$(outdir)/%.texi))\
+ $(OUT_MASTER_TEXI_FILES)
 
 OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
 
@@ -16,4 +18,3 @@ TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES)
 
 EXTRA_DIST_FILES +=$(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) $(ILY_FILES)
 
-TEXI2PDF_FLAGS += -I $(top-build-dir)/$(outdir)/lys/