X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=make%2Fdoc-i18n-root-vars.make;h=03bc122520932c5653177529a5dab5b5ec2383bc;hb=6d751144f402dc58ff3f65df0fcaab021a86908c;hp=55e7c349a2344499a6b84d67bacea74eb539737f;hpb=3b90066318a10f103cafa2806494293e1bf27cfa;p=lilypond.git

diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 55e7c349a2..03bc122520 100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -1,10 +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)
+LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
 
 CSS_SOURCE_FILES = $(shell ls $(top-src-dir)/Documentation/lilypond*.css)
 
@@ -32,6 +28,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,31 +40,25 @@ 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)
+XREF_MAP_FLAGS += -I $(outdir) -I$(src-dir)
 
-WEB_MANUALS=general
+WEB_MANUALS=web
 
 ###########
 ifneq ($(ISOLANG),)
 TEXI2HTML_LANG = --lang=$(ISOLANG)
 endif
 
-DOC_TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
-WEB_TEXI2HTML_INIT =--init-file=$(top-src-dir)/Documentation/web-texi2html.init
-TEXI2HTML_INIT = $(DOC_TEXI2HTML_INIT)
+$(XREF_MAPS_DIR)/web.$(ISOLANG).xref-map:\
+	XREF_MAP_FLAGS += --split=node
 
-DOC_TEXI2HTML_SPLIT = --prefix=index --split=section
-WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files
-TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT)
+TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
 
-$(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
-	TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
-$(top-build-dir)/Documentation/$(outdir)/general/index.$(ISOLANG).html:\
-	TEXI2HTML_SPLIT := $(WEB_TEXI2HTML_SPLIT)
+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_INIT) $(TEXI2HTML_LANG)
-TEXI2HTML = SRC_DIR=$(src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
+TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_LANG) $(TEXI2HTML_INIT) 
+TEXI2HTML = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM)
 ###########
 
 TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)