diff options
| author | Julien Rioux <jrioux@physics.utoronto.ca> | 2011-12-16 20:35:35 -0500 |
|---|---|---|
| committer | Julien Rioux <jrioux@physics.utoronto.ca> | 2012-02-22 09:12:05 -0500 |
| commit | fa554b6115c178b466d69caa1d7d68a340e11e20 (patch) | |
| tree | ce4b1910d1540c02231b26307c3694f23fff8d3a /stepmake | |
| parent | 0bb3eb14a16a605ca202dacbf657bdbe5dc94ebf (diff) | |
Build: Unify the rules and variables for xref-map files.
Diffstat (limited to 'stepmake')
| -rw-r--r-- | stepmake/stepmake/texinfo-rules.make | 5 | ||||
| -rw-r--r-- | stepmake/stepmake/texinfo-vars.make | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 5977076464..7b5da4a65f 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -58,8 +58,13 @@ else $(buildscript-dir)/run-and-check "DEPTH=$(depth)/../ AJAX_SEARCH=$(AJAX_SEARCH) $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output=$(dir $@) $<" "$*.splittexi.log" endif +ifneq ($(ISOLANG),) +$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map + $(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -o $(XREF_MAPS_DIR) --master-map-file=$(XREF_MAPS_DIR)/$*.xref-map $< +else $(XREF_MAPS_DIR)/%.xref-map: $(outdir)/%.texi $(buildscript-dir)/extract_texi_filenames $(XREF_MAP_FLAGS) -o $(XREF_MAPS_DIR) $< +endif $(outdir)/%.info: %.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi $(outdir)/weblinks.itexi $(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<" "$*.makeinfo.log" diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make index b98b1ccbda..d164356555 100644 --- a/stepmake/stepmake/texinfo-vars.make +++ b/stepmake/stepmake/texinfo-vars.make @@ -37,10 +37,14 @@ MAKEINFO_FLAGS += --enable-encoding --error-limit=0 $(DOCUMENTATION_INCLUDES) MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS) # texi2html xref map files -# FIXME: duplicated in stepake/texinfo-vars.make make/doc-i18n-root-vars.make XREF_MAPS_DIR = $(top-build-dir)/$(outdir)/xref-maps +ifneq ($(ISOLANG),) +XREF_MAPS_FILES += $(TEXI_FILES:%.texi=$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map) \ + $(TELY_FILES:%.tely=$(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map) +else XREF_MAPS_FILES += $(TEXI_FILES:%.texi=$(XREF_MAPS_DIR)/%.xref-map) \ $(TELY_FILES:%.tely=$(XREF_MAPS_DIR)/%.xref-map) +endif XREF_MAP_FLAGS += -I $(outdir) -I $(src-dir) $(DOCUMENTATION_INCLUDES) ########### |