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

diff --cc Documentation/user/GNUmakefile
Simple merge

diff --cc configure.in
Simple merge

diff --cc make/doclang-vars.make
index 230e511721e54c2c9fbb21b19e99dc6a8b797441,2577e9d285f037cbce0ff98b237c9271832a2a8c..1debd618731986360b8c02fd3f2127f739c2cb58
--- 1/make/doclang-vars.make
--- 2/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@@ -13,12 -10,7 +13,12 @@@ LILYPOND_BOOK_INCLUDES += $(DOCUMENTATI
  MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES)
  MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
  
- TEXI2PDF_FLAGS += --batch --tidy --command '@set version $(TOPLEVEL_VERSION)'
 +TEXI2HTML_INIT= --init-file=$(top-src-dir)/lilypond-texi2html.init
 +TEXI2HTML_LANG=--lang=$(ISOLANG)
 +TEXI2HTML_FLAGS += $(TEXI2HTML_LANG)
 +TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM)
 +
+ TEXI2PDF_FLAGS += --batch --command '@set version $(TOPLEVEL_VERSION)'
  TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
  
  TELY_FILES = $(call src-wildcard,*.tely)

diff --cc stepmake/stepmake/texinfo-rules.make
index b02bb9cbc0f6febe79011eac98d6073a35f161fe,23213f8d94ca1834b44e876013cfda8dcd47470c..024cf869e0924f3d678cf4ba7ff58be04e3880a3
--- 1/stepmake/stepmake/texinfo-rules.make
--- 2/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@@ -15,30 -13,16 +13,25 @@@
  # prerequisite, otherwise %.info are always outdated (because older
  # than $(outdir), hence this .dep file
  
- $(outdir)/%.info-images-dir.dep: $(outdir)/%.texi
-       rm -f $*
-       ln -s $(outdir) $*
-       mkdir -p $(outdir)/$*
-       find $(outdir)/$*/ -name '*'.png | xargs rm -f
-       (cd $(outdir)/$*/ ; ln -sf ../*.png . )
-       touch $@
- 
- else
- 
- $(outdir)/.info-images-dir.dep:
-       touch $@
- 
+ $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep: $(INFO_DOCS:%=$(outdir)/%.texi)
+ ifneq ($(INFO_IMAGES_DIR),)
+       rm -f $(INFO_IMAGES_DIR)
+       ln -s $(outdir) $(INFO_IMAGES_DIR)
+       mkdir -p $(outdir)/$(INFO_IMAGES_DIR)
+       rm -f $(outdir)/$(INFO_IMAGES_DIR)/[a-f0-9][a-f0-9]
+       cd $(outdir)/$(INFO_IMAGES_DIR) && $(PYTHON) $(top-src-dir)/buildscripts/mass-link.py symbolic .. . [a-f0-9][a-f0-9]
  endif
+       touch $@
  
 +# Settings for texi2html:
 +ifneq ($(ISOLANG),) 
 +TEXI2HTML_LANG = --lang=$ISOLANG
 +endif
 +TEXI2HTML_FLAGS += --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES)
 +TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG)
 +
 +
 +
  $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep
        $(MAKEINFO) -I$(outdir) --output=$@ $<