From 22c29f3d7a47390171e830147de3a83065527cab Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Mon, 6 Jul 2009 17:55:45 +0200 Subject: [PATCH] Translated docs: fix 'cp' error about multiple CSS files copying Also split some long lines. (cherry picked from commit 5ed99c554c70919cd1ddfe65f9bb00250e920db7) --- make/doc-i18n-user-rules.make | 8 ++++---- make/doc-i18n-user-vars.make | 7 +++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/make/doc-i18n-user-rules.make b/make/doc-i18n-user-rules.make index 4b59115ecd..1c0002a857 100644 --- a/make/doc-i18n-user-rules.make +++ b/make/doc-i18n-user-rules.make @@ -1,11 +1,11 @@ -$(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) +$(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) $(CSS_SOURCE_FILES) mkdir -p $(dir $@) $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< - cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) + cp -u $(CSS_SOURCE_FILES) $(dir $@) -$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) +$(outdir)/%-big-page.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(OUT_PNG_IMAGES) $(CSS_SOURCE_FILES) $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) -D bigpage $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $< - cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) + cp -u $(CSS_SOURCE_FILES) $(dir $@) $(outdir)/%.pdftexi: $(outdir)/%.texi $(buildscript-dir)/texi-gettext $(ISOLANG) $< diff --git a/make/doc-i18n-user-vars.make b/make/doc-i18n-user-vars.make index 2170d43f40..8281b30d09 100644 --- a/make/doc-i18n-user-vars.make +++ b/make/doc-i18n-user-vars.make @@ -2,8 +2,11 @@ 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 +CSS_SOURCE_FILES = $(shell ls $(top-src-dir)/Documentation/lilypond*.css) +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 TELY_FILES := $(call src-wildcard,*.tely) MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi) -- 2.39.2