X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fdoc-i18n-root-vars.make;h=8c20f494bde0106e624edd30e2a9c140267dcd84;hb=547a32b2fbaf533c4da03a490a316ce76085c1b1;hp=207ef4472dda81cd1cd747c6945f02268ed70e1a;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 207ef4472d..8c20f494bd 100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -2,8 +2,6 @@
 
 LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
 
-CSS_SOURCE_FILES = $(shell ls $(top-src-dir)/Documentation/lilypond*.css)
-
 TELY_FILES := $(call src-wildcard,*.tely)
 TEXI_FILES := $(call src-wildcard,*.texi)
 MASTER_TEXI_FILES := $(TEXI_FILES) $(TELY_FILES:%.tely=$(outdir)/%.texi)
@@ -13,14 +11,14 @@ TEXINFO_MANUALS =\
  $(TEXI_FILES:%.texi=%)
 
 TOPDIR_HTML_MANUALS = 
-SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
- $(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),,$(manual)))
-NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLITTED_HTML_MANUALS),\
+SPLIT_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
+ $(if $(findstring $(manual), $(UNSPLIT_HTML_MANUALS)),,$(manual)))
+NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLIT_HTML_MANUALS),\
  $(if $(findstring $(manual), $(TOPDIR_HTML_MANUALS)),,$(manual)))
 
-OUT_HTML_FILES += $(UNSPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html) \
+OUT_HTML_FILES += $(UNSPLIT_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).html) \
  $(TOPDIR_HTML_MANUALS:%=$(outdir)/index.$(ISOLANG).html)
-BIG_PAGE_HTML_FILES := $(SPLITTED_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html)
+BIG_PAGE_HTML_FILES := $(SPLIT_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%-big-page.$(ISOLANG).html)
 DEEP_HTML_FILES := $(NOT_TOPDIR_HTML_MANUALS:%=$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html)
 PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%.$(ISOLANG).pdf)
 
@@ -28,6 +26,7 @@ ITELY_FILES := $(call src-wildcard,*.itely)
 ITEXI_FILES := $(call src-wildcard,*.itexi)
 
 DOCUMENTATION_INCLUDES = \
+  -I $(top-src-dir)/Documentation/$(ISOLANG)/included \
   -I $(top-src-dir)/Documentation \
   -I $(top-build-dir)/Documentation/$(outdir)
 
@@ -39,7 +38,7 @@ MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 # FIXME: duplicated in stepake/texinfo-vars.make make/doc-i18n-root-vars.make
 XREF_MAPS_DIR=$(top-build-dir)/$(outdir)/xref-maps
 XREF_MAPS_FILES=$(TEXINFO_MANUALS:%=$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map)
-XREF_MAP_FLAGS += -I $(outdir) -I$(src-dir)
+XREF_MAP_FLAGS += -I $(outdir) -I $(src-dir) $(DOCUMENTATION_INCLUDES)
 
 WEB_MANUALS=web