X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Ftexinfo-vars.make;h=0e52898b6055e3b9626e2112c2ebe26d4f67bfb4;hb=1cbd558eea13d742beae758fb6031a630a84ae07;hp=e5b2e981253331c2ed44d824ed012531f5d2eae0;hpb=c570e7303fd918e21bca0edd957ae2e7805ddd1c;p=lilypond.git diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make index e5b2e98125..0e52898b60 100644 --- a/stepmake/stepmake/texinfo-vars.make +++ b/stepmake/stepmake/texinfo-vars.make @@ -20,27 +20,22 @@ 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 =--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 -# --split=node --node-files makes that translated pages have -# translated file names, that breaks. -## WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files -WEB_TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT) +WEB_TEXI2HTML_SPLIT = --prefix=index --split=node --node-files TEXI2HTML_SPLIT = $(DOC_TEXI2HTML_SPLIT) -TEXI2HTML_INCLUDES += --I=. --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR) +TEXI2HTML_INCLUDES += --I=$(src-dir) --I=$(outdir) $(DOCUMENTATION_INCLUDES) --I=$(XREF_MAPS_DIR) TEXI2HTML_FLAGS += $(TEXI2HTML_INCLUDES) $(TEXI2HTML_INIT) $(TEXI2HTML_LANG) -TEXI2HTML = PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) +TEXI2HTML = SRC_DIR=$(src-dir) PERL_UNICODE=SD $(TEXI2HTML_PROGRAM) ###########