From a83a8b6e15a5cbbd94f0e6a7157457da0475c6d3 Mon Sep 17 00:00:00 2001
From: John Mandereau <john.mandereau@gmail.com>
Date: Thu, 30 Jul 2009 02:17:00 +0200
Subject: [PATCH] Translated docs: make distinction between
 splitted/non-splitted documents

Also fix spacing nits in other GNUmakefile.
---
 Documentation/GNUmakefile     | 2 +-
 Documentation/es/GNUmakefile  | 2 ++
 make/doc-i18n-root-rules.make | 2 ++
 make/doc-i18n-root-vars.make  | 9 +++++++--
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 009dfd13a4..792b09b277 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -60,7 +60,7 @@ PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf)
 
 UNSPLITTED_HTML_MANUALS = changes
 SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
-$(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),, $(manual)))
+ $(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),,$(manual)))
 
 OUT_HTML_FILES = $(UNSPLITTED_HTML_MANUALS:%=$(outdir)/%.html)\
  $(SPLITTED_HTML_MANUALS:%=$(outdir)/%-big-page.html)
diff --git a/Documentation/es/GNUmakefile b/Documentation/es/GNUmakefile
index 809ac364e5..3f45dc35f9 100644
--- a/Documentation/es/GNUmakefile
+++ b/Documentation/es/GNUmakefile
@@ -4,4 +4,6 @@ SUBDIRS = application learning notation texidocs
 STEPMAKE_TEMPLATES = documentation
 LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-root
 
+UNSPLITTED_HTML_MANUALS = changes
+
 include $(depth)/make/stepmake.make
diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make
index bf2545af68..1a24bc6796 100644
--- a/make/doc-i18n-root-rules.make
+++ b/make/doc-i18n-root-rules.make
@@ -8,6 +8,8 @@ $(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html: $(outdir)/%.te
 $(top-build-dir)/Documentation/$(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) $<
 
+$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map $(outdir)/version.itexi
+	$(TEXI2HTML) --I=$(src-dir) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
 
 $(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf: $(outdir)/%.texi
 	cd $(outdir) && \
diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 5eaa432110..e838f36cba 100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -14,8 +14,13 @@ OUT_PNG_IMAGES = \
 
 TELY_FILES := $(call src-wildcard,*.tely)
 MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi)
-BIG_PAGE_HTML_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html)
-DEEP_HTML_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html)
+
+SPLITTED_HTML_MANUALS = $(foreach manual, $(TELY_FILES:%.tely=%),\
+ $(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),,$(manual)))
+
+OUT_HTML_FILES += $(UNSPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html)
+BIG_PAGE_HTML_FILES := $(SPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html)
+DEEP_HTML_FILES := $(SPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html)
 PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf)
 
 ITELY_FILES := $(call src-wildcard,*.itely)
-- 
2.39.5