Build fixes for translated manuals: dependencies and a typo

diff --git a/Documentation/cs/GNUmakefile b/Documentation/cs/GNUmakefile
index 2b7f1a1ec444bf53cf869ded553c173a7443985e..58ed9bf4c1423771058026164a3ee6a651946868 100644 (file)
--- 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 2bcd15fe6ae8f5214dbaae853c695a57de2cfbee..9f98d45bb33bc1cb0d2ddeffe254ea99671f9b52 100644 (file)
--- 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 54197f95ddb367cadfe6f6bff186530e9ab9a588..2862faa97709d765f0efa0af32d9c02cd829031b 100644 (file)
--- 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 33caa87f754de9442b1db22cdddf0e423370a198..4243708c39fa162ce6315e6bc3f69d4e20eec5dd 100644 (file)
--- 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 983c7b43b66794d878dd929ca4870f4a500699f9..17c8262aac6df813afd7e6f709f0555ee29eb142 100644 (file)
--- 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 db64d84904f814b5c3e7044661b18e5e713ff9bd..054b8137f0f08397afe6c0693dde16778f52ea88 100644 (file)
--- 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 e6e94662718f73d602863d54cf2e6411f2193df4..5557016e76ce51699306af78448c2be788698376 100644 (file)
--- 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 84e61106647bc5be0698c3d691071a5153072d8d..a90448d77bc427c16b66a07fef6291e9d400295a 100644 (file)
--- 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 9e9d8bda16996710344a26734046a258596c33c6..c888a0ef279d095db718fdaa5b3317f3777e93de 100644 (file)
--- 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 f510dedd7c8caf35bf3bb4a9bf5196e795ef137c..fc01d8c887884497d21f4316e15e16aebdf86286 100644 (file)
--- 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 e5ea060283e5cf2a47c214eb5ce9e1c6b8a071ed..a022da9ae5d79d1ead37fcf6a8ab18272a0e256c 100644 (file)
--- 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),)