From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 24 Mar 2008 21:19:16 +0000 (+0100)
Subject: Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev... 
X-Git-Tag: release/2.11.58-1~32^2~186
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a3248563e82178e4c16dcb0e99b24d4679f8544b;hp=-c;p=lilypond.git

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

a3248563e82178e4c16dcb0e99b24d4679f8544b
diff --combined make/doclang-vars.make
index 8dbc19f835,28a795b0da..ba99a62fcb
--- a/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)