From 3013ae598ba51789b8487c43b65e30263154f56d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 10 Nov 2008 19:26:23 +0100 Subject: [PATCH] Add some includes for makeinfo. Fixes build of documentation. LANG= makeinfo --enable-encoding -I./out-www --output=out-www/lilypond-internals.info out-www/lilypond-internals.texi out-www/lilypond-internals.texi:12: @include `macros.itexi': No such file or directory. out-www/lilypond-internals.texi:858: Unknown command `q'. ... out-www/lilypond-internals.texi:8910: Misplaced {. out-www/lilypond-internals.texi:8910: Misplaced }. Too many errors! Gave up. make[7]: *** [out-www/lilypond-internals.info] Error 1 make[7]: Leaving directory `/home/janneke/vc/gub/target/linux-64/build/lilypond-git.sv.gnu.org--lilypond.git-master/Documentation/user' make[6]: *** [WWW-1] Error 2 --- Documentation/user/GNUmakefile | 4 ++-- make/doc-i18n-user-rules.make | 4 ++-- stepmake/stepmake/texinfo-rules.make | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 656526318a..d7e089218c 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -78,11 +78,11 @@ $(outdir)/lilypond-learning-big-page.html: $(OUT_PNG_IMAGES) $(outdir)/lilypond.xml: $(outdir)/lilypond.texi mkdir -p $(dir $@) - $(MAKEINFO) -I$(outdir) --output=$@ --docbook $< + $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ --docbook $< $(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internals.texi mkdir -p $(dir $@) - $(MAKEINFO) --output=$(outdir)/lilypond-internals --docbook $< + $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(outdir)/lilypond-internals --docbook $< $(outdir)/lilypond.pdf $(outdir)/lilypond-learning.pdf: $(OUT_PDF_IMAGES) diff --git a/make/doc-i18n-user-rules.make b/make/doc-i18n-user-rules.make index 9734641f23..66a97cc228 100644 --- a/make/doc-i18n-user-rules.make +++ b/make/doc-i18n-user-rules.make @@ -10,10 +10,10 @@ $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-m else # Rules using makeinfo follow $(outdir)/%/index.html: $(outdir)/%.texi mkdir -p $(dir $@) - $(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< + $(MAKEINFO) -I$(src-dir) -I$(outdir) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< $(outdir)/%-big-page.html: $(outdir)/%.texi - $(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< + $(MAKEINFO) -I$(src-dir) -I$(outdir) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< endif $(outdir)/%.pdftexi: $(outdir)/%.texi diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 41f06925fb..ae2c4acc8f 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -24,7 +24,7 @@ endif touch $@ $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi - $(MAKEINFO) -I$(outdir) --output=$@ $< + $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $< ifeq (,$(findstring texi2html,$(MISSING_OPTIONAL))) $(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi @@ -42,14 +42,14 @@ $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/v else # Rules using makeinfo follow $(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 $< + $(MAKEINFO) -I$(src-dir) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $< $(outdir)/%.html: $(outdir)/%.texi $(outdir)/version.itexi - $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< + $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< $(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi mkdir -p $(dir $@) - $(MAKEINFO) -I $(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< + $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $< endif $(outdir)/%.html.omf: %.texi @@ -65,7 +65,7 @@ $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) --batch $(TEXINFO_PAPERSIZE_OPTION) $(