Merge branch 'master' into dev/texi2html

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

diff --git a/make/doclang-vars.make b/make/doclang-vars.make
index 1debd618731986360b8c02fd3f2127f739c2cb58..9e34dac5ecbf1ecf694949089c3a0ffcb059665d 100644 (file)
--- a/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@ -10,21 +10,20 @@ DOCUMENTATION_INCLUDES = \
   -I $(top-build-dir)/Documentation/user/$(outdir)
 
 LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
-MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES)
+MAKEINFO_FLAGS += --force --enable-encoding $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
 TEXI2HTML_INIT= --init-file=$(top-src-dir)/lilypond-texi2html.init
 TEXI2HTML_LANG=--lang=$(ISOLANG)
-TEXI2HTML_FLAGS += $(TEXI2HTML_LANG)
+TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(DOCUMENTATION_INCLUDES)
 TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM)
 
-TEXI2PDF_FLAGS += --batch --command '@set version $(TOPLEVEL_VERSION)'
-TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
+TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)
 
-TELY_FILES = $(call src-wildcard,*.tely)
-OUT_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi)
-DEEP_HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%/index.html)
-PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
+TELY_FILES := $(call src-wildcard,*.tely)
+MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi)
+DEEP_HTML_FILES := $(TELY_FILES:%.tely=$(outdir)/%/index.html)
+PDF_FILES := $(TELY_FILES:%.tely=$(outdir)/%.pdf)
 
 ITELY_FILES := $(call src-wildcard,*.itely)
 ITEXI_FILES := $(call src-wildcard,*.itexi)