diff options
| author | Phil Holmes <mail@philholmes.net> | 2012-02-11 16:18:02 +0000 |
|---|---|---|
| committer | Phil Holmes <mail@philholmes.net> | 2012-02-17 10:16:41 +0000 |
| commit | 9cf5411d1e02cb316662b73b8fb483062ec6e754 (patch) | |
| tree | b207e38996f6bcb33c0752e7eee1d20b935b3764 /make | |
| parent | 6a1a605d8235d799c5f19f334c9341e19e2d587c (diff) | |
Final redirection of texi output
Diffstat (limited to 'make')
| -rw-r--r-- | make/doc-i18n-root-rules.make | 14 | ||||
| -rw-r--r-- | make/doc-i18n-root-vars.make | 6 |
2 files changed, 7 insertions, 13 deletions
diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make index 3cdd664471..6435166baf 100644 --- a/make/doc-i18n-root-rules.make +++ b/make/doc-i18n-root-rules.make @@ -7,19 +7,17 @@ $(outdir)/web.texi: $(outdir)/weblinks.itexi $(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES) mkdir -p $(dir $@) mkdir -p $(outdir)/$* - DEPTH=$(depth)/../ $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output=$(outdir)/$* $< >$*.splittexi.log 2>&1 + $(buildscript-dir)/run-and-check "DEPTH=$(depth)/../ $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output=$(outdir)/$* $<" "$*.splittexi.log" find $(outdir)/$* -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/$(outdir) $(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES) - DEPTH=$(depth) $(TEXI2HTML) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $< >$*.bigtexi.log 2>&1 + $(buildscript-dir)/run-and-check "DEPTH=$(depth) $(TEXI2HTML) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $<" "$*.bigtexi.log" $(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(outdir)/version.itexi $(outdir)/weblinks.itexi - DEPTH=$(depth) $(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $< >$*.texilog 2>&1 + $(buildscript-dir)/run-and-check "DEPTH=$(depth) $(TEXI2HTML) $(TEXI2HTML_FLAGS) --output=$@ $<" "$*.texilog" $(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf: $(outdir)/%.texi - cd $(outdir) && \ - texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $*.texi && \ - mkdir -p $(dir $@) && mv $*.pdf $@ + $(buildscript-dir)/run-and-check "cd $(outdir) && texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $*.texi && mkdir -p $(dir $@) && mv $*.pdf $@ < /dev/null" "$*.texi2pdf.log" $(outdir)/version.%: $(top-src-dir)/VERSION $(PYTHON) $(top-src-dir)/scripts/build/create-version-itexi.py > $@ @@ -45,11 +43,11 @@ $(TRANSLATION_LILY_IMAGES): $(MASTER_TEXI_FILES) touch $@ $(outdir)/lilypond-%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi $(outdir)/weblinks.itexi - $(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $< + $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<" "$*.makeinfo.log" $(outdir)/index.$(ISOLANG).html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT) $(outdir)/index.$(ISOLANG).html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT) $(outdir)/index.$(ISOLANG).html: - DEPTH=$(depth) $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(TEXI2HTML_SPLIT) --output=$(outdir)/ web.texi + $(buildscript-dir)/run-and-check "DEPTH=$(depth) $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(TEXI2HTML_SPLIT) --output=$(outdir)/ web.texi" "webtexi.log" find $(outdir)/ -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/$(outdir) diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make index 8c20f494bd..8f6f11e97f 100644 --- a/make/doc-i18n-root-vars.make +++ b/make/doc-i18n-root-vars.make @@ -59,12 +59,8 @@ TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) ########### -TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES) +TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES) TEXI2PDF_FLAGS += -I $(LYS_OUTPUT_DIR) -ifdef QUIET_BUILD -TEXI2PDF_FLAGS += -q -endif - DOCUMENTATION_LOCALE_TARGET = $(outdir)/doc-po TRANSLATION_LILY_IMAGES = $(outdir)/translation-lily-images |