Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

diff --combined make/doclang-vars.make
index 8dbc19f83562c08e7acfaa4fbb52502fee9d1479,28a795b0da9bc9f789f467934866aecb4cf16301..ba99a62fcb7f21f9a160f0a0ab70d3c0af642e60
--- 1/make/doclang-vars.make
--- 2/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@@ -5,15 -5,12 +5,15 @@@ LANGS = $(shell $(PYTHON) $(buildscript
  DOCUMENTATION_INCLUDES = \
    -I $(top-src-dir)/Documentation/user \
    -I $(top-build-dir)/Documentation/user/$(outdir)
- DOCUMENTATION_INCLUDES += $(foreach lang, $(LANGS), -I $(top-build-dir)/Documentation/$(lang)/user/$(outdir))
+ DOCUMENTATION_INCLUDES += $(foreach lang,$(LANGS), -I $(top-build-dir)/Documentation/$(lang)/user/$(outdir))
  
  LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
  MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES)
  MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
  
 +TEXI2HTML_FLAGS += --init-file=$(top-src-dir)/lilypond-texi2html.init --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES)
 +TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS)
 +
  TEXI2PDF_FLAGS += --batch --tidy --command '@set version $(TOPLEVEL_VERSION)'
  TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)