resolve merge

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

diff --git a/make/ly-vars.make b/make/ly-vars.make
index c3c8a24ba4be7a12edb6422211431e07388e1681..7d572adb750c212847b326e9729adb16288d46ab 100644 (file)
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -1,8 +1,7 @@
 # rules for directories with LilyPond files.
 
 TELY_FILES := $(call src-wildcard,*.tely)
-MASTER_TEXI_FILES := $(sort $(TELY_FILES:%.tely=$(outdir)/%.texi))\
- $(OUT_MASTER_TEXI_FILES)
+TEXI_FILES_FROM_TELY := $(TELY_FILES:%.tely=$(outdir)/%.texi) $(TEXI_FILES_FROM_TELY)
 
 OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))