Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/make/doclang-vars.make b/make/doclang-vars.make
index 5458e90c202ba69e3fa74576cf108c1b19ae64df..08d17b919aebe4ce94104e3b6d93256608004d77 100644 (file)
--- a/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@ -7,11 +7,10 @@ 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)
 
-TEXI2PDF_FLAGS += --batch --tidy --command '@set version $(TOPLEVEL_VERSION)'
-TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
+TEXI2PDF_FLAGS += -q --batch $(DOCUMENTATION_INCLUDES)
 
 TELY_FILES = $(call src-wildcard,*.tely)
 OUT_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi)