From 3829c0c7db8768ca05f148e8f5c271ddb56d5bae Mon Sep 17 00:00:00 2001 From: Sabyasachi Bhoi Date: Thu, 4 Nov 2021 13:55:07 +0530 Subject: Resolves: tdf#97046 ensure build system variables start with gb_ Change the variable name: var2file to gb_var2file Change-Id: Ib7d64b76cfe10e6c2df1a176674a360b28704070 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124666 Tested-by: Jenkins Reviewed-by: Michael Stahl --- postprocess/CustomTarget_images.mk | 2 +- postprocess/CustomTarget_registry.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'postprocess') diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 42ddfdadd8c7..90709780ae22 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -51,7 +51,7 @@ $(packimages_DIR)/images_%.zip : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(call gb_Helper_abbreviate_dirs, \ - ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ + ILSTFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ $(call gb_ExternalExecutable_get_command,python) \ $(SRCDIR)/solenv/bin/pack_images.py \ $(if $(DEFAULT_THEME),\ diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index bb4a1841962d..fa30e33ae0c7 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -648,7 +648,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : $(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) - mv $(call var2file,$@.tmp,70, $(foreach i,$(postprocess_DEPS_$*), ) \ + mv $(call gb_var2file,$@.tmp,70, $(foreach i,$(postprocess_DEPS_$*), ) \ $(foreach i,$(postprocess_OPTDEPS_$*), ) \ $(foreach i,$(postprocess_FILES_$*), $(i)) ) \ $@ -- cgit