X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Ftexinfo-vars.make;h=b66e47897c6ea55712fb31afb5388e09ca062dd9;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=83c90e1f10b750adfda991addda0d1ec5e60ecd4;hpb=fabf53486884f78f54855a7b4a59cb105d83f638;p=lilypond.git

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 83c90e1f10..b66e47897c 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -1,5 +1,5 @@
 
-TEXI_FILES = $(wildcard *.texi)
+TEXI_FILES = $(call src-wildcard,*.texi)
 
 ALL_SOURCES += $(TEXI_FILES)
 
@@ -7,7 +7,17 @@ TEXINFO_SOURCES = $(TEXI_FILES)
 
 OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
-GENERATE_OMF = $(PYTHON) $(depth)/buildscripts/texi2omf.py --format $(1) --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+GENERATE_OMF = $(PYTHON) $(depth)/buildscripts/texi2omf.py --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
 
+MAKEINFO = LANG= $(MAKEINFO_PROGRAM)  --enable-encoding
+
+
+# info stuff
+INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
+INFO_INSTALL_COMMAND =$(if $(INFO_INSTALL_FILES),\
+	$(INSTALL) -d $(DESTDIR)$(package_infodir) ; \
+	$(MAKE) INSTALLATION_OUT_DIR=$(package_infodir) \
+		depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" \
+		-f $(stepdir)/install-out.sub.make,true)