-XREF_MAPS_DIR=$(top-build-dir)/out/xref-maps
-XREF_MAPS_FILES=$(INFO_DOCS:%=$(XREF_MAPS_DIR)/%.xref-map)
+XREF_MAPS_DIR = $(top-build-dir)/out/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)