Merge branch 'master' into dev/texi2html

Conflicts:

	stepmake/stepmake/texinfo-vars.make

diff --cc Documentation/user/GNUmakefile
Simple merge

diff --cc GNUmakefile.in
Simple merge

diff --cc stepmake/stepmake/generic-targets.make
index 2df68ac3ca29746669b2677956ba5f3548cfa5f7,2fe267ed44f180de2f311f0b4e7e788f88e212f6..b73dfa56b05423981b66104d1ffb195854578560
--- 1/stepmake/stepmake/generic-targets.make
--- 2/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@@ -187,13 -182,8 +188,12 @@@ WWW-2: local-WWW-
        $(LOOP)
  
  web:
 -      $(MAKE) out=www WWW
 +      $(MAKE) out=www WWW-1
 +      $(MAKE) out=www WWW-2
        $(MAKE) out=www WWW-post
  
 +web-1:
 +      $(MAKE) out=www WWW-1
 +
  web-clean:
-       find -name out-www | xargs rm -rf
        $(MAKE) out=www clean

diff --cc stepmake/stepmake/texinfo-rules.make
index b44b6300ec23d082960eece70ea257bf228566ed,328ef02412861c61cd746d32d0559e4c95a7ffe1..5a2b2245481c116cfb82dadf16b58d5180b7bbaf
--- 1/stepmake/stepmake/texinfo-rules.make
--- 2/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@@ -23,17 -23,14 +23,17 @@@ ifneq ($(INFO_IMAGES_DIR),
  endif
        touch $@
  
- $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep $(outdir)/version.itexi
+ $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
        $(MAKEINFO) -I$(outdir) --output=$@ $<
  
 -$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.itexi
 -      $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
 +$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi
 +      $(TEXI2HTML) --I=$(outdir) -D bigpage --output=$@ $(TEXI2HTML_INIT) $< 
 +      cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
  
 -$(outdir)/%.html: $(outdir)/%.texi $(outdir)/version.itexi
 -      $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
 +
 +$(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi
 +      $(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $<
 +      cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
  
  $(outdir)/%.html.omf: %.texi
        $(call GENERATE_OMF,html)

diff --cc stepmake/stepmake/texinfo-targets.make
Simple merge

diff --cc stepmake/stepmake/texinfo-vars.make
index 1a67332d4bdcca35adc0c8ba8870d6611bc005d9,a3d706f1f794aaa6811fba6d9121b502a39a7788..dcfa5e63b947758070ce6ffdf9959fe8575464ac
--- 1/stepmake/stepmake/texinfo-vars.make
--- 2/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@@ -13,20 -14,9 +13,22 @@@ TEXINFO_PAPERSIZE_OPTION= $(if $(findst
  MAKEINFO_FLAGS = --enable-encoding
  MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
  
 +# texi2html xref map files
 +XREF_MAPS_DIR=$(top-build-dir)/out/xref-maps
 +XREF_MAPS_FILES=$(INFO_DOCS:%=$(XREF_MAPS_DIR)/%.xref-map)
 +
 +# texi2html flags
 +ifneq ($(ISOLANG),) 
 +TEXI2HTML_LANG = --lang=$(ISOLANG)
 +endif
 +TEXI2HTML_FLAGS += --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES) \
 +  --I=$(XREF_MAPS_DIR)
 +TEXI2HTML_INIT = --init-file=$(top-src-dir)/lilypond-texi2html.init
 +TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG)
 +
+ ifdef QUIET_BUILD
  TEXI2PDF_FLAGS += -q
+ endif
  
  # info stuff
  INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))