On Wed, Dec 14, 2011 at 3:54 PM, <[email protected]> wrote: > LGTM. Could you send me the final patch so I can push to staging > immediately? > > > http://codereview.appspot.com/5477088/
Sure, here it is. Please test make doc before pushing. Regards, Julien
From 7622b10136dd48dafb246659b8a83ebe7f590407 Mon Sep 17 00:00:00 2001 From: Julien Rioux <[email protected]> Date: Tue, 29 Nov 2011 05:18:19 -0500 Subject: [PATCH] Build fixes for translated manuals: dependencies and a typo --- Documentation/cs/GNUmakefile | 2 +- Documentation/de/GNUmakefile | 2 +- Documentation/es/GNUmakefile | 2 +- Documentation/fr/GNUmakefile | 2 +- Documentation/hu/GNUmakefile | 2 +- Documentation/it/GNUmakefile | 2 +- Documentation/ja/GNUmakefile | 2 +- Documentation/nl/GNUmakefile | 2 +- Documentation/zh/GNUmakefile | 2 +- make/doc-i18n-root-rules.make | 4 ++-- make/doc-i18n-root-targets.make | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Documentation/cs/GNUmakefile b/Documentation/cs/GNUmakefile index 2b7f1a1..58ed9bf 100644 --- a/Documentation/cs/GNUmakefile +++ b/Documentation/cs/GNUmakefile @@ -2,7 +2,7 @@ ISOLANG = cs depth = ../.. # SUBDIRS = web learning notation texidocs usage included essay extending SUBDIRS = web learning texidocs essay usage -STEPMAKE_TEMPLATES = documentation +STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root NO_PDF_FILES = 1 EXTRA_DIST_FILES = web.texi diff --git a/Documentation/de/GNUmakefile b/Documentation/de/GNUmakefile index 2bcd15f..9f98d45 100644 --- a/Documentation/de/GNUmakefile +++ b/Documentation/de/GNUmakefile @@ -1,7 +1,7 @@ ISOLANG = de depth = ../.. SUBDIRS = web learning notation texidocs essay usage extending included -STEPMAKE_TEMPLATES = documentation +STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root EXTRA_DIST_FILES = web.texi diff --git a/Documentation/es/GNUmakefile b/Documentation/es/GNUmakefile index 54197f9..2862faa 100644 --- a/Documentation/es/GNUmakefile +++ b/Documentation/es/GNUmakefile @@ -1,7 +1,7 @@ ISOLANG = es depth = ../.. SUBDIRS = essay learning notation texidocs usage web extending included -STEPMAKE_TEMPLATES = documentation +STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root diff --git a/Documentation/fr/GNUmakefile b/Documentation/fr/GNUmakefile index 33caa87..4243708 100644 --- a/Documentation/fr/GNUmakefile +++ b/Documentation/fr/GNUmakefile @@ -1,7 +1,7 @@ ISOLANG = fr depth = ../.. SUBDIRS = web learning notation texidocs usage included essay extending -STEPMAKE_TEMPLATES = documentation +STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root EXTRA_DIST_FILES = web.texi diff --git a/Documentation/hu/GNUmakefile b/Documentation/hu/GNUmakefile index 983c7b4..17c8262 100644 --- a/Documentation/hu/GNUmakefile +++ b/Documentation/hu/GNUmakefile @@ -1,7 +1,7 @@ ISOLANG = hu depth = ../.. SUBDIRS = web learning texidocs usage -STEPMAKE_TEMPLATES = documentation +STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root EXTRA_DIST_FILES = web.texi diff --git a/Documentation/it/GNUmakefile b/Documentation/it/GNUmakefile index db64d84..054b813 100644 --- a/Documentation/it/GNUmakefile +++ b/Documentation/it/GNUmakefile @@ -1,7 +1,7 @@ ISOLANG = it depth = ../.. SUBDIRS = learning texidocs web usage included -STEPMAKE_TEMPLATES = documentation +STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root EXTRA_DIST_FILES = web.texi diff --git a/Documentation/ja/GNUmakefile b/Documentation/ja/GNUmakefile index e6e9466..5557016 100644 --- a/Documentation/ja/GNUmakefile +++ b/Documentation/ja/GNUmakefile @@ -1,7 +1,7 @@ ISOLANG = ja depth = ../.. SUBDIRS = web learning texidocs usage included notation -STEPMAKE_TEMPLATES = documentation +STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root NO_PDF_FILES = 1 diff --git a/Documentation/nl/GNUmakefile b/Documentation/nl/GNUmakefile index 84e6110..a90448d 100644 --- a/Documentation/nl/GNUmakefile +++ b/Documentation/nl/GNUmakefile @@ -1,7 +1,7 @@ ISOLANG = nl depth = ../.. SUBDIRS = included web learning texidocs -STEPMAKE_TEMPLATES = documentation +STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root # NO_PDF_FILES = 1 diff --git a/Documentation/zh/GNUmakefile b/Documentation/zh/GNUmakefile index 9e9d8bd..c888a0e 100644 --- a/Documentation/zh/GNUmakefile +++ b/Documentation/zh/GNUmakefile @@ -2,7 +2,7 @@ ISOLANG = zh depth = ../.. # SUBDIRS = web learning notation texidocs usage included essay extending SUBDIRS = web texidocs -STEPMAKE_TEMPLATES = documentation +STEPMAKE_TEMPLATES = documentation texinfo LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root NO_PDF_FILES = 1 EXTRA_DIST_FILES = web.texi diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make index f510ded..fc01d8c 100644 --- a/make/doc-i18n-root-rules.make +++ b/make/doc-i18n-root-rules.make @@ -1,8 +1,8 @@ .SUFFIXES: .html .info .texi .texinfo -$(outdir)/%.texi: $(src-dir)/%.texi - cp -p $< $@ +# Explicitly list the dependencies on generated content +$(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 $@) diff --git a/make/doc-i18n-root-targets.make b/make/doc-i18n-root-targets.make index e5ea060..a022da9 100644 --- a/make/doc-i18n-root-targets.make +++ b/make/doc-i18n-root-targets.make @@ -1,7 +1,7 @@ default: ifeq ($(out),www) -ifneq ($(N0_PDF_FILES),) +ifneq ($(NO_PDF_FILES),) local-WWW-1: $(MASTER_TEXI_FILES) $(XREF_MAPS_FILES) endif ifeq ($(NO_PDF_FILES),) -- 1.7.4.1
_______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
