From 360d48ad7f594bab722ae38dceb02f1c285ac6b1 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 12 Nov 2007 11:45:11 +0100 Subject: [PATCH] For .info generation, run makeinfo from outdir. Fixes images in info files. Makeinfo must have PNGs in cwd when building info docs with images. --- Documentation/user/GNUmakefile | 15 ++++++--------- make/doclang-targets.make | 2 +- stepmake/stepmake/texinfo-rules.make | 3 ++- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 1ba38e5e97..59cf7a11af 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -69,19 +69,19 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr) @echo " (cd $(package_infodir) && ln -sf ../../doc/lilypond/Documentation/user/*png .)" @echo "or add something like that to the postinstall script." @echo -else +else # installing directly into standard /usr/... -$(INSTALL) -d $(DESTDIR)$(package_infodir) -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-program.info -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-learning.info install-info --info-dir=$(infodir) $(outdir)/lilypond.info (cd $(package_infodir) && ln -sf $(webdir)/Documentation/user/*png .) -endif +endif # installing directly into standard /usr/... local-uninstall-WWW: rm -f $(package_infodir)/*.png -else +else # out!=www # Cancel the default info generation rule that generates images: $(outdir)/%.info: # $(outdir)/%.texi @@ -104,7 +104,7 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr) @echo @echo "and read the extra instructions." @echo -else +else # installing directly into standard /usr/... -$(INSTALL) -d $(DESTDIR)$(package_infodir) -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond-program.info @@ -116,10 +116,9 @@ else @echo @echo " make out=www install-info " @echo -endif +endif # installing into standard /usr/* root# installing into /usr/... - -endif +endif # out!=www # All web targets, except info image symlinks and info docs are # installed in non-recursing target from TOP-SRC-DIR @@ -199,8 +198,6 @@ $(outdir)/lilypond-learning-big-page.html: $(outdir)/lilypond-learning.texi $(OU $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $< - - # # The split internals reference # diff --git a/make/doclang-targets.make b/make/doclang-targets.make index 8366970f1f..fcd7539a7f 100644 --- a/make/doclang-targets.make +++ b/make/doclang-targets.make @@ -42,7 +42,7 @@ local-WWW: $(DEEP_HTML_FILES) $(PDF_FILES) LINKED_PNGS = henle-flat-gray.png baer-flat-gray.png lily-flat-bw.png -# makeinfo is broken, it MUST have PNGs in output dir +# makeinfo MUST have PNGs in cwd for info images to work # symlinking PNGs... # lilypond-book -I flag seems broken too, and texi2pdf -I flag confuses # pdfetex with .aux and other files from English manual diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 8dbd7167f9..48a6f7e900 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -2,7 +2,8 @@ .SUFFIXES: .html .info .texi .texinfo $(outdir)/%.info: $(outdir)/%.texi - $(MAKEINFO) -I $(outdir) --output=$@ $< +# makeinfo MUST have PNGs in cwd for info images to work + cd $(outdir) && $(MAKEINFO) -I$(srcdir) --output=$(@F) $(