Translated docs makefiles nits

- always assume ISOLANG variable is defined -- it's not useful to
  complicate the makefile to make it work when ISOLANG is undefined,
  because in this case the resulting commands in local-WWW would make
  no sense;

- link PNGs to avoid -I flag;

- TEXI2HTML vars nitpicks.

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index 3a56cd2ada4dd1895b9b45909e9d6c0fe3d6b1ae..94f77806bf907b27eebc31bb1a746c7b710dea93 100644 (file)
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -1,14 +1,10 @@
-ifneq "$(ISOLANG)" ""
-TEXI2HTML_LANG=--lang=$(ISOLANG)
-endif
-
-$(outdir)/%/index.html: $(outdir)/%.texi
+$(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES)
        mkdir -p $(dir $@)
-       $(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) $<
+       $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $<
        cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 
-$(outdir)/%-big-page.html: $(outdir)/%.texi
-       $(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) $< 
+$(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES)
+       $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $<
        cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 
 $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po
@@ -17,6 +13,9 @@ $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po
 $(outdir)/%.pdf: $(outdir)/%.pdftexi
        cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
 
+$(outdir)/%.png: $(top-build-dir)/Documentation/user/$(outdir)/%.png
+       ln -f $< $@
+
 $(OUT_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
 
 $(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES)

diff --git a/make/doclang-vars.make b/make/doclang-vars.make
index c09d1cb0519d8b00d1012d740945280b40562ab4..4b94169c83c1876113c1c2dc082dfb2af488b4aa 100644 (file)
--- a/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@ -2,6 +2,9 @@
 
 LANGS = $(shell $(PYTHON) $(buildscript-dir)/langdefs.py)
 
+SOURCE_PNG_IMAGES=$(shell ls $(top-src-dir)/Documentation/user/*.png)
+OUT_PNG_IMAGES=$(SOURCE_PNG_IMAGES:$(top-src-dir)/Documentation/user/%.png=$(outdir)/%.png) $(outdir)/context-example.png
+
 DOCUMENTATION_INCLUDES = \
   -I $(top-src-dir)/Documentation/user \
   -I $(top-build-dir)/Documentation/user/$(outdir)
@@ -10,9 +13,10 @@ LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
 MAKEINFO_FLAGS += --force --enable-encoding -D 'version $(TOPLEVEL_VERSION)' $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
-TEXI2HTML_FLAGS = 
-TEXI2HTML_INIT = --init-file=$(top-src-dir)/lilypond-texi2html.init
-TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS)
+TEXI2HTML_LANG=--lang=$(ISOLANG)
+TEXI2HTML_INIT= --init-file=$(top-src-dir)/lilypond-texi2html.init
+TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(TEXI2HTML_INIT)
+TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM)
 
 TEXI2PDF_FLAGS += --batch --tidy --command '@set version $(TOPLEVEL_VERSION)'
 TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)