X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Ftexinfo-vars.make;h=8054cbe826234a9a35ad5f7a907bc4701dea04ea;hb=69f0ec479a6ade46d0a227755bb02562112c6743;hp=3b6a0e5ed336eb0d0ac72a5f3309aab2a00c8be2;hpb=d5f72b53d15b0f461ecafecc4d7139fb2d7d95b9;p=lilypond.git

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 3b6a0e5ed3..8054cbe826 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -1,28 +1,43 @@
 TEXI_FILES = $(call src-wildcard,*.texi)
-
 ALL_SOURCES += $(TEXI_FILES)
-
 TEXINFO_SOURCES = $(TEXI_FILES)
 
 OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
-GENERATE_OMF = $(PYTHON) $(buildscript-dir)/texi2omf.py --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TEXI_FILES), $(outdir)/$(f:.tely=.$(format)).omf))
+
+GENERATE_OMF = $(buildscript-dir)/texi2omf --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
 
-MAKEINFO_FLAGS = --enable-encoding
+DOCUMENTATION_INCLUDES += -I $(top-src-dir)/Documentation
+
+MAKEINFO_FLAGS += --enable-encoding $(DOCUMENTATION_INCLUDES)
 MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
-ifneq ($(ISOLANG),) 
+# texi2html xref map files
+XREF_MAPS_DIR = $(top-build-dir)/out/xref-maps
+XREF_MAPS_FILES += $(TEXI_FILES:%.texi=$(XREF_MAPS_DIR)/%.xref-map) \
+ $(TELY_FILES:%.tely=$(XREF_MAPS_DIR)/%.xref-map)
+XREF_MAP_FLAGS += -I $(outdir)
+
+# texi2html flags
+ifneq ($(ISOLANG),)
 TEXI2HTML_LANG = --lang=$(ISOLANG)
 endif
-TEXI2HTML_FLAGS += --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES)
-TEXI2HTML_INIT = --init-file=$(top-src-dir)/lilypond-texi2html.init
-TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG)
+TEXI2HTML_FLAGS += $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR)
+TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
+TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG)
+
+TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES)
+
+ifdef QUIET_BUILD
+TEXI2PDF_FLAGS += -q
+endif
 
 # info stuff
 INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
-INFO_INSTALL_COMMAND =$(if $(INFO_INSTALL_FILES),\
+INFO_INSTALL_COMMAND = $(if $(INFO_INSTALL_FILES),\
 	$(INSTALLPY) -d $(DESTDIR)$(infodir) ; \
 	$(MAKE) INSTALLATION_OUT_DIR=$(infodir) \
 		depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" \