From eca3d05456383fc0b451468ce1b21ed08229821f Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Mon, 6 Mar 2017 23:23:22 +0900 Subject: [PATCH] Issue 5083: Add making web.$(ISOLANG).pdf English document web.pdf is built by `make doc'. However, i18n (non-English) document web.$(ISOLANG).pdf is not built. This commit adds making web.$(ISOLANG).pdf. --- make/doc-i18n-root-rules.make | 6 +++++- make/doc-i18n-root-vars.make | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make index e36acd7356..aa597609c7 100644 --- a/make/doc-i18n-root-rules.make +++ b/make/doc-i18n-root-rules.make @@ -23,12 +23,16 @@ $(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf: $(outdir)/%.pdf $(outdir)/%.png: $(top-build-dir)/Documentation/$(outdir)/%.png ln -f $< $@ -$(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES) $(outdir)/pictures +$(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES) $(outdir)/pictures $(outdir)/ly-examples $(outdir)/pictures: $(MAKE) -C $(top-build-dir)/Documentation/pictures out=www WWW-1 ln -sf $(top-build-dir)/Documentation/pictures/$(outdir) $@ +$(outdir)/ly-examples: + $(MAKE) -C $(top-build-dir)/Documentation/ly-examples out=www WWW-1 + ln -sf $(top-build-dir)/Documentation/ly-examples/$(outdir) $@ + $(TRANSLATION_LILY_IMAGES): $(MASTER_TEXI_FILES) find $(outdir) \( -name 'lily-*.png' -o -name 'lily-*.ly' \) | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link hard $(outdir) $(top-build-dir)/Documentation/$(outdir) find $(outdir) \( -name '*.??.idx' \) | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link hard $(outdir) $(top-build-dir)/Documentation/$(outdir) diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make index 9ff0df3a77..3d66af4695 100644 --- a/make/doc-i18n-root-vars.make +++ b/make/doc-i18n-root-vars.make @@ -21,7 +21,7 @@ OUT_HTML_FILES += $(UNSPLIT_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outd $(TOPDIR_HTML_MANUALS:%=$(outdir)/index.$(ISOLANG).html) BIG_PAGE_HTML_FILES := $(SPLIT_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html) DEEP_HTML_FILES := $(NOT_TOPDIR_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html) -PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf) +PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf) $(TEXI_FILES:%.texi=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf) ITELY_FILES := $(call src-wildcard,*.itely) ITEXI_FILES := $(call src-wildcard,*.itexi) @@ -31,6 +31,7 @@ DOCUMENTATION_INCLUDES += \ -I $(top-build-dir)/Documentation/snippets/out \ -I $(top-src-dir)/Documentation/$(ISOLANG)/included \ -I $(top-src-dir)/Documentation/included \ + -I $(top-src-dir)/Documentation/$(ISOLANG) \ -I $(top-src-dir)/Documentation \ -I $(top-src-dir)/input/regression -- 2.39.5