X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fdoc-i18n-root-vars.make;h=48cfcdbb123c9fd43313373e492ca1553cb867ed;hb=7b5ff8ac30bccd7c31954d6fffeb0cf333fd9d4f;hp=8f6f11e97f110388b6314e622863b6136b2c7fbf;hpb=9cf5411d1e02cb316662b73b8fb483062ec6e754;p=lilypond.git

diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make
index 8f6f11e97f..48cfcdbb12 100644
--- a/make/doc-i18n-root-vars.make
+++ b/make/doc-i18n-root-vars.make
@@ -4,11 +4,12 @@ LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
 
 TELY_FILES := $(call src-wildcard,*.tely)
 TEXI_FILES := $(call src-wildcard,*.texi)
-MASTER_TEXI_FILES := $(TEXI_FILES) $(TELY_FILES:%.tely=$(outdir)/%.texi)
+MASTER_TEXI_FILES := $(TEXI_FILES:%=$(outdir)/%) $(TELY_FILES:%.tely=$(outdir)/%.texi)
 
 TEXINFO_MANUALS =\
  $(TELY_FILES:%.tely=%)\
  $(TEXI_FILES:%.texi=%)
+OUT_TEXINFO_MANUALS = $(TEXINFO_MANUALS:%=$(outdir)/%.texi)
 
 TOPDIR_HTML_MANUALS = 
 SPLIT_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
@@ -25,21 +26,17 @@ PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%.$(IS
 ITELY_FILES := $(call src-wildcard,*.itely)
 ITEXI_FILES := $(call src-wildcard,*.itexi)
 
-DOCUMENTATION_INCLUDES = \
+DOCUMENTATION_INCLUDES += \
+  -I $(top-build-dir)/Documentation/$(outdir) \
+  -I $(top-build-dir)/Documentation/snippets/out \
   -I $(top-src-dir)/Documentation/$(ISOLANG)/included \
+  -I $(top-src-dir)/Documentation/included \
   -I $(top-src-dir)/Documentation \
-  -I $(top-build-dir)/Documentation/$(outdir)
+  -I $(top-src-dir)/input/regression
 
-LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES)
-MAKEINFO_FLAGS += --force --enable-encoding $(DOCUMENTATION_INCLUDES)
+MAKEINFO_FLAGS += --enable-encoding $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
-# texi2html xref map files
-# 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) $(DOCUMENTATION_INCLUDES)
-
 WEB_MANUALS=web
 
 ###########