From d6e2f16f3eacba9b4a23c30a4f235af8f71a43d5 Mon Sep 17 00:00:00 2001
From: John Mandereau <john.mandereau@gmail.com>
Date: Tue, 22 Sep 2009 02:19:20 +0200
Subject: [PATCH] Fix image paths in Texinfo docs build outside the source tree

---
 Documentation/GNUmakefile           |  4 +---
 Documentation/common-macros.itexi   | 20 ++++++++------------
 stepmake/stepmake/texinfo-vars.make |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index fed30f5d1f..c5045faa5f 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -165,9 +165,7 @@ $(outdir)/general.texi: $(outdir)/examples
 
 $(outdir)/examples:
 	$(MAKE) -C general/examples
-# FIXME: who is replacing src="examples --> src="../examples" ?
-# [ugh, why do most scripts not even say they run anymore?]
-	ln -sf general/examples $@
+	ln -sf ../general/examples/$(outdir) $@
 endif
 
 # Ugh, using '%' twice not possible
diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index 58cb805418..128a80a702 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -188,11 +188,10 @@ UNTRANSLATED NODE: IGNORE ME
 </div>
 @end html
 @iftex
-@image{general/examples/out-www/\IMAGE-FILE\-small,,,\IMAGE-FILE\,png}
+@image{examples/\IMAGE-FILE\-small,,,\IMAGE-FILE\,png}
 @end iftex
 @ifinfo
-FIXME: images broken in info
-@c @sourceimage{lilypond/general/examples/out-www/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
+@image{lilypond/examples/\IMAGE-FILE\,,,\IMAGE-FILE\,png}
 @end ifinfo
 @end macro
 
@@ -210,11 +209,10 @@ FIXME: images broken in info
 </div>
 @end html
 @iftex
-@image{pictures/out-www/\IMAGE-FILE\,,,\IMAGE-FILE\}
+@image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
 @end iftex
 @ifinfo
-FIXME: images broken in info
-@c @sourceimage{lilypond/\IMAGE-FILE\,,,\IMAGE-FILE\}
+@image{lilypond/pictures/\IMAGE-FILE\,,,\IMAGE-FILE\}
 @end ifinfo
 @end macro
 
@@ -223,11 +221,10 @@ FIXME: images broken in info
 <img class="float-\POSITION\" src="pictures/\IMAGE-FILE\.\EXT\" alt="\IMAGE-FILE\">
 @end html
 @iftex
-@image{pictures/out-www/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
+@image{pictures/\IMAGE-FILE\,,,\IMAGE-FILE\,\EXT\}
 @end iftex
 @ifinfo
-FIXME: images broken in info
-@c @sourceimage{lilypond/\IMAGE-FILE\,,,\EXT\}
+@image{lilypond/pictures/\IMAGE-FILE\,,,\EXT\}
 @end ifinfo
 @end macro
 
@@ -238,11 +235,10 @@ FIXME: images broken in info
 </div>
 @end html
 @iftex
-@image{pictures/out-www/\IMAGE-FILE\,,,\ALT\}
+@image{pictures/\IMAGE-FILE\,,,\ALT\}
 @end iftex
 @ifinfo
-FIXME: images broken in info
-@c @sourceimage{lilypond/\IMAGE-FILE\,,,\ALT\}
+@image{lilypond/pictures/\IMAGE-FILE\,,,\ALT\}
 @end ifinfo
 @end macro
 
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 871d635315..3f6deada2f 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -35,7 +35,7 @@ DOC_TEXI2HTML_SPLIT = --prefix=index --split=section
 WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files
 TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
 
-TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
+TEXI2HTML_INCLUDES += --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
 TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG)
 TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########
-- 
2.39.2