diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-04 14:29:17 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-04 16:28:03 +0200 |
| commit | 52fc9164940a7e778cf4b03a984f7259bd92f9fa (patch) | |
| tree | 5e68056217c9de620529c6ee0be243f77da3e538 /solenv/gbuild/HelpTarget.mk | |
| parent | c8a145afbff81d4c19c2346870eb005c775862b1 (diff) | |
makefile simplification: replace $(call gb_HelpTranslatePartTarget_get_workdir,foo)
…by a simple/static $(gb_HelpTranslatePartTarget_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f
Change-Id: I2525b03eadf75b108499701f7f576634619ccf1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167122
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv/gbuild/HelpTarget.mk')
| -rw-r--r-- | solenv/gbuild/HelpTarget.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index aa114d373b0b..2a629fcbd129 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -45,14 +45,14 @@ $(call gb_Helper_abbreviate_dirs, \ -l $(HELP_LANG) \ -mi $${HELPFILES} \ -m $${POFILES} \ - -o $(call gb_HelpTranslatePartTarget_get_workdir,$(2)) && \ + -o $(gb_HelpTranslatePartTarget_workdir)/$(2) && \ rm -f $${POFILES} \ , \ $(gb_HelpTranslatePartTarget_COMMAND) \ -l $(HELP_LANG) \ -mi $${HELPFILES} \ -m \ - -o $(call gb_HelpTranslatePartTarget_get_workdir,$(2)) \ + -o $(gb_HelpTranslatePartTarget_workdir)/$(2) \ ) \ ) && \ touch $@ && \ @@ -83,7 +83,7 @@ $(call gb_HelpTranslatePartTarget_get_target,$(1)) : POFILES := $(3) $(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE) $(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(3) $(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(dir $(call gb_HelpTranslatePartTarget_get_target,$(1))).dir -$(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(call gb_HelpTranslatePartTarget_get_workdir,$(1))/.dir +$(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(gb_HelpTranslatePartTarget_workdir)/$(1)/.dir endef @@ -99,7 +99,7 @@ endef gb_HelpTranslateTarget__get_lang = $(lastword $(subst /, ,$(1))) gb_HelpTranslateTarget__get_partname = $(call gb_HelpTranslateTarget__get_lang,$(1))/$(patsubst %/,%,$(2)) -gb_HelpTranslateTarget__get_part_workdir = $(call gb_HelpTranslatePartTarget_get_workdir,$(call gb_HelpTranslateTarget__get_partname,$(1),$(2))) +gb_HelpTranslateTarget__get_part_workdir = $(gb_HelpTranslatePartTarget_workdir)/$(call gb_HelpTranslateTarget__get_partname,$(1),$(2)) gb_HelpTranslateTarget_get_translated_target = $(call gb_HelpTranslatePartTarget_get_translated_target,$(call gb_HelpTranslateTarget__get_partname,$(1),$(dir $(2))),$(notdir $(2))) gb_HelpTranslateTarget__get_any_translated_target = $(abspath $(call gb_HelpTranslatePartTarget_get_translated_target,,$(1))) |