Docs makefiles: get rid of unconditional translations postprocessing

(cherry picked from commit 7b36ea66c480a8ef5a7a7eae72dec3fae303ee7b)

diff --git a/make/doc-i18n-user-rules.make b/make/doc-i18n-user-rules.make
index 75a6497f4fe8f337edab4eb0df6814c231757b1e..e02da6f516b71e180404b502036292ef7b043d8b 100644 (file)
--- a/make/doc-i18n-user-rules.make
+++ b/make/doc-i18n-user-rules.make
@@ -1,17 +1,23 @@
-$(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) $(CSS_SOURCE_FILES)
+$(top-build-dir)/Documentation/user/$(outdir)/%/index.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES)
        mkdir -p $(dir $@)
-       $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
-       cp  $(CSS_SOURCE_FILES) $(dir $@)
+       mkdir -p $(outdir)/$*
+       $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(outdir)/$* --prefix=index --split=section $(TEXI2HTML_INIT) $<
+       find $(outdir)/$* -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(buildscript-dir)/html-gettext $(ISOLANG)
+       find $(outdir)/$* -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir)
 
-$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) $(CSS_SOURCE_FILES)
+
+$(top-build-dir)/Documentation/user/$(outdir)/%-big-page.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(TRANSLATION_LILY_IMAGES)
        $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
-       cp  $(CSS_SOURCE_FILES) $(dir $@)
+       $(buildscript-dir)/html-gettext $(ISOLANG) $@
+
 
 $(outdir)/%.pdftexi: $(outdir)/%.texi
        $(buildscript-dir)/texi-gettext $(ISOLANG) $<
 
-$(outdir)/%.pdf: $(outdir)/%.pdftexi
-       cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
+$(top-build-dir)/Documentation/user/$(outdir)/%.$(ISOLANG).pdf: $(outdir)/%.pdftexi
+       cd $(outdir) && \
+       texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $*.pdftexi && \
+       mkdir -p $(dir $@) && mv $*.pdf $@
 
 $(outdir)/version.%: $(top-src-dir)/VERSION
        echo '@macro version'> $@
@@ -26,4 +32,8 @@ $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref
 
 $(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
 
+$(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/user/$(outdir)
+       touch $@
+
 .SECONDARY:

diff --git a/make/doc-i18n-user-targets.make b/make/doc-i18n-user-targets.make
index e27afb0697cc993b7f2bb7bb639f7131fc7fb738..85cc0b1927161486cffedff42c37c7b77bd16725 100644 (file)
--- a/make/doc-i18n-user-targets.make
+++ b/make/doc-i18n-user-targets.make
@@ -9,9 +9,6 @@ local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) $(XREF_MAPS_FILES)
 endif
 
 local-WWW-2: $(DEEP_HTML_FILES) $(BIG_PAGE_HTML_FILES) $(DOCUMENTATION_LOCALE_TARGET)
-       find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(buildscript-dir)/html-gettext $(ISOLANG)
-       find $(outdir) -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir) $(TELY_FILES:%.tely=%.pdf)
-       find $(outdir) \( -name 'lily-*.png' -o -name 'lily-*.ly' \) | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir)
 
 $(DOCUMENTATION_LOCALE_TARGET):
        $(MAKE) -C $(depth)/Documentation/po out=www messages

diff --git a/make/doc-i18n-user-vars.make b/make/doc-i18n-user-vars.make
index ac3b0d9b9ceeb60c47a681c6756e636cb9be6b0c..ff2e2afebe2b96d2c68ca302bebeaca9c7fa295f 100644 (file)
--- a/make/doc-i18n-user-vars.make
+++ b/make/doc-i18n-user-vars.make
@@ -10,9 +10,9 @@ OUT_PNG_IMAGES = \
 
 TELY_FILES := $(call src-wildcard,*.tely)
 MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi)
-BIG_PAGE_HTML_FILES := $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)
-DEEP_HTML_FILES := $(TELY_FILES:%.tely=$(outdir)/%/index.html)
-PDF_FILES := $(TELY_FILES:%.tely=$(outdir)/%.pdf)
+BIG_PAGE_HTML_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/user/$(outdir)/%-big-page.$(ISOLANG).html)
+DEEP_HTML_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/user/$(outdir)/%/index.$(ISOLANG).html)
+PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/user/$(outdir)/%.$(ISOLANG).pdf)
 
 ITELY_FILES := $(call src-wildcard,*.itely)
 ITEXI_FILES := $(call src-wildcard,*.itexi)
@@ -43,3 +43,4 @@ TEXI2PDF_FLAGS += -q
 endif
 
 DOCUMENTATION_LOCALE_TARGET = $(outdir)/doc-po
+TRANSLATION_LILY_IMAGES = $(outdir)/translation-lily-images