From: John Mandereau <john.mandereau@gmail.com>
Date: Thu, 17 Apr 2008 21:13:51 +0000 (+0200)
Subject: Merge branch 'dev/texi2html' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into... 
X-Git-Tag: release/2.11.58-1~32^2~143
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f96e38fbbbfba9cf4729323beb518a65ae77d562;p=lilypond.git

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

* 'dev/texi2html' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond: (61 commits)
  Some corrections in NR 1.8 Text
  GDP: NR 2 Reorganisation: Wind headings
  Update input/new guidelines
  Typo
  Add example of stand-alone markup.
  Move input/new doctitles and update LSR
  Compile fix.
  Minor tweaks.
  Update from Valentin.
  Update from Ralph.
  Oops, real compile fix.
  Compile fix.
  Corrections to input/new snippets from Neil
  GDP: NR 2 Reorganisation: Percussion headings
  Fix makelsr.py and update input/lsr
  Tune lilypond-book performance
  Fix broken xref
  Update texinfo.tex from texinfo CVS
  Rework info-images-dir.dep stuff
  Remove --tidy
  ...

Conflicts:

	make/doclang-vars.make
	stepmake/stepmake/texinfo-rules.make
---

f96e38fbbbfba9cf4729323beb518a65ae77d562
diff --cc stepmake/stepmake/texinfo-rules.make
index f676dc69f2,024cf869e0..e4ee4b50b6
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@@ -15,22 -13,26 +13,17 @@@
  # 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
 +$(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep $(outdir)/version.texi
  	$(MAKEINFO) -I$(outdir) --output=$@ $<