From 881e13a10014af4ad380a0e71696971198c20218 Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Fri, 18 Apr 2008 15:52:39 +0200 Subject: [PATCH] Docs: Depend on version.itexi (included from macros.itexi), not version.texi --- make/doclang-rules.make | 8 ++++---- stepmake/stepmake/texinfo-rules.make | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/make/doclang-rules.make b/make/doclang-rules.make index c25fd6e786..36a53f956a 100644 --- a/make/doclang-rules.make +++ b/make/doclang-rules.make @@ -1,16 +1,16 @@ -$(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.texi +$(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.itexi mkdir -p $(dir $@) $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond.css $(dir $@) -$(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.texi +$(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.itexi $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond.css $(dir $@) -$(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.texi +$(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.itexi $(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $< -$(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.texi +$(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.itexi cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi $(outdir)/version.%: $(top-src-dir)/VERSION diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index ab1f7746a2..3c602e6018 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -23,20 +23,20 @@ ifneq ($(INFO_IMAGES_DIR),) endif touch $@ -$(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep $(outdir)/version.texi +$(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep $(outdir)/version.itexi $(MAKEINFO) -I$(outdir) --output=$@ $< -$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.texi +$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi mkdir -p $(dir $@) $(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond.css $(dir $@) -$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.texi +$(outdir)/%-big-page.html: $(outdir)/%.texi $(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.texi +$(outdir)/%.html: $(outdir)/%.texi $(outdir)/version.itexi $(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $< cp $(top-src-dir)/Documentation/lilypond.css $(dir $@) @@ -49,10 +49,10 @@ $(outdir)/%.pdf.omf: %.texi $(outdir)/%.ps.gz.omf: %.texi $(call GENERATE_OMF,ps.gz) -$(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.texi +$(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) --batch $(TEXINFO_PAPERSIZE_OPTION) $(