X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Ftexinfo-vars.make;h=4c990d9f042b9164afa2f743356c2b6ed66f07fa;hb=cc043cb11f95f3d565df2ab791d5a571bb365cd5;hp=4638ab223528589376c7a724ad9fbd7f9d887a0a;hpb=c97e8c0656f224ef8ec3a50baceeb1254e9159d2;p=lilypond.git diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make index 4638ab2235..4c990d9f04 100644 --- a/stepmake/stepmake/texinfo-vars.make +++ b/stepmake/stepmake/texinfo-vars.make @@ -20,24 +20,20 @@ MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS) XREF_MAPS_DIR = $(top-build-dir)/$(outdir)/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) +XREF_MAP_FLAGS += -I $(outdir) -I $(src-dir) ########### ifneq ($(ISOLANG),) TEXI2HTML_LANG = --lang=$(ISOLANG) endif -DOC_TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init -WEB_TEXI2HTML_INIT =-D web_manual --init-file=$(top-src-dir)/Documentation/web-texi2html.init -TEXI2HTML_INIT = $(DOC_TEXI2HTML_INIT) +TEXI2HTML_INIT = --init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init -DOC_TEXI2HTML_SPLIT = --prefix=index --split=section -WEB_TEXI2HTML_SPLIT = --prefix=index --split=subsubsection -TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT) +TEXI2HTML_SPLIT = --prefix=index --split=section TEXI2HTML_INCLUDES += --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 = TOP_SRC_DIR=$(top-src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) ###########