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

diff --combined stepmake/stepmake/texinfo-rules.make
index 253c3d6bef05fdd0e559d2281b55f548ffa059f9,d346c04fe87187d333755727a63ca6375537d30d..e8863890e4a22e286ff03b8469817214726a51a3
--- 1/stepmake/stepmake/texinfo-rules.make
--- 2/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@@ -8,7 -8,7 +8,7 @@@
  # symlinks, see replace_symlinks_urls in
  # buildscripts/add_html_footer.py.
  
- ifneq ($(INFO_IMAGES_DIR),)
+ ifneq ($(INFO_IMAGES_DIR),'')
  
  # make dereferences symlinks, and $(INFO_IMAGES_DIR) is a symlink
  # to $(outdir), so we can't use directly $(INFO_IMAGES_DIR) as a
@@@ -30,32 -30,14 +30,32 @@@ $(outdir)/.info-images-dir.dep
  
  endif
  
 +# 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=$@ $<
  
 +
 +$(outdir)/%/index.html: $(outdir)/%.texi
 +      mkdir -p $(dir $@)
 +      $(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
 +      cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 +
 +# TODO: Pass -D bigpage to texi2html
  $(outdir)/%-big-page.html: $(outdir)/%.texi
 -      $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
 +      $(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $< 
 +      cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
  
  $(outdir)/%.html: $(outdir)/%.texi
 -      $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
 +      $(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $<
 +      cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
  
  $(outdir)/%.html.omf: %.texi
        $(call GENERATE_OMF,html)
@@@ -66,6 -48,10 +66,6 @@@ $(outdir)/%.pdf.omf: %.tex
  $(outdir)/%.ps.gz.omf: %.texi
        $(call GENERATE_OMF,ps.gz)
  
 -$(outdir)/%/index.html: $(outdir)/%.texi
 -      mkdir -p $(dir $@)
 -      $(MAKEINFO) -I $(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 -
  $(outdir)/%.pdf: $(outdir)/%.texi
        cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) --batch $(TEXINFO_PAPERSIZE_OPTION) $(<F)