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

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index b66e47897c..d36ff83b81 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -7,17 +7,18 @@ TEXINFO_SOURCES = $(TEXI_FILES)
 
 OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
-GENERATE_OMF = $(PYTHON) $(depth)/buildscripts/texi2omf.py --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+GENERATE_OMF = $(PYTHON) $(buildscript-dir)/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
+MAKEINFO_FLAGS = --enable-encoding
+MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
 
 # 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) \
+	$(INSTALLPY) -d $(DESTDIR)$(infodir) ; \
+	$(MAKE) INSTALLATION_OUT_DIR=$(infodir) \
 		depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" \
 		-f $(stepdir)/install-out.sub.make,true)