X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fdoc-i18n-root-vars.make;h=8c20f494bde0106e624edd30e2a9c140267dcd84;hb=84e6f36e6a5d5f088f45c41244b2e6271322469a;hp=cd047d780c7679269256edfa4622f7c98494cca5;hpb=1cbd558eea13d742beae758fb6031a630a84ae07;p=lilypond.git

diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index cd047d780c..8c20f494bd 100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -1,12 +1,6 @@
-HTML_PAGE_NAMES = translations
-HTML_FILES = $(HTML_PAGE_NAMES:%=%.html)
-OUT_HTML_FILES = $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
-
 # ISOLANG must be defined
 
-LANGS = $(shell $(PYTHON) $(buildscript-dir)/langdefs.py)
-
-CSS_SOURCE_FILES = $(shell ls $(top-src-dir)/Documentation/lilypond*.css)
+LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
 
 TELY_FILES := $(call src-wildcard,*.tely)
 TEXI_FILES := $(call src-wildcard,*.texi)
@@ -17,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)
 
@@ -32,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)
 
@@ -43,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
 
@@ -52,20 +47,16 @@ ifneq ($(ISOLANG),)
 TEXI2HTML_LANG = --lang=$(ISOLANG)
 endif
 
-TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
-
-DOC_TEXI2HTML_SPLIT = --prefix=index --split=section
-WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files
-TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
-
-$(top-build-dir)/Documentation/$(outdir)/web/index.$(ISOLANG).html:\
-	TEXI2HTML_SPLIT := $(WEB_TEXI2HTML_SPLIT)
 $(XREF_MAPS_DIR)/web.$(ISOLANG).xref-map:\
 	XREF_MAP_FLAGS += --split=node
 
+TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
+
+TEXI2HTML_SPLIT = --prefix=index --split=section
+
 TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
 TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) 
-TEXI2HTML = SRC_DIR=$(src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
+TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########
 
 TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)