makefile simplification: replace $(call gb_CustomTarget_get_workdir,foo)

…by a simple/static $(gb_CustomTarget_workdir)/foo

The build system has a lot of overly complicated leftovers from when it
was introduced and had not only deal with split repositories but also
had to coexist with another buildsystem. Along with lots of copy'n'paste
along the years the makefiles became hard to grasp for newcomers with
all our calls and evals.
As a first step to streamline that, the macros from TargetLocations that
simply prefix a static path to the argument (and similar of the same
kind) are a natural pick before simplifying the rules themselves/getting
rid of a bunch of eval statements.

Change-Id: Ia06dbbcd5d1994755a2ff05b84f72ccbc4e3cab5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167005
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

19 files changed, 77 insertions, 77 deletions

diff --git a/extras/AllLangPackage_autotextshare.mk b/extras/AllLangPackage_autotextshare.mk
index 4d2eee32884c..5c99540eef7f 100644
--- a/extras/AllLangPackage_autotextshare.mk
+++ b/extras/AllLangPackage_autotextshare.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(call gb_CustomTarget_get_workdir,extras/source/autotext)))
+$(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(gb_CustomTarget_workdir)/extras/source/autotext))
 
 $(eval $(call gb_AllLangPackage_add_files,autotextshare,$(LIBO_SHARE_FOLDER)/autotext,\
 	af/standard.bau \
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk
index 201697952b19..6fcbc2c66481 100644
--- a/extras/CustomTarget_autocorr.mk
+++ b/extras/CustomTarget_autocorr.mk
@@ -245,8 +245,8 @@ extras_AUTOCORR_XMLFILES := \
 # param: shortlang
 extras_AUTOCORR_XMLFILES_LANG = $(subst $(1)/,,$(filter $(1)/%,$(extras_AUTOCORR_XMLFILES)))
 
-$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : \
-        | $(dir $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype).dir
+$(gb_CustomTarget_workdir)/extras/source/autocorr/%/mimetype : \
+        | $(dir $(gb_CustomTarget_workdir)/extras/source/autocorr/%/mimetype).dir
 	$(call gb_Output_announce,autocorr/$*/mimetype,$(true),TCH,1)
 	$(call gb_Trace_StartRange,autocorr/$*/mimetype,TCH)
 	touch $@
@@ -256,9 +256,9 @@ $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : \
 # secondexpansion since the pattern not just covers a file, but also a directory portion with
 # different number of elements (just the lang or lang/META-INF) and thus the directory dependency
 # needs the stem of the actual target to work as intended
-$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.xml : $(SRCDIR)/extras/source/autocorr/lang/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/autocorr/%.xml : $(SRCDIR)/extras/source/autocorr/lang/%.xml \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
-          $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/$$*.xml).dir
+          $$(dir $(gb_CustomTarget_workdir)/extras/source/autocorr/$$*.xml).dir
 	$(call gb_Output_announce,autocorr/$*.xml,$(true),XSL,1)
 	$(call gb_Trace_StartRange,autocorr/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
@@ -269,9 +269,9 @@ $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.xml : $(SRCDIR)/ext
 # allows the actual stem from the target to be used in the macro calls
 # there's no reason for the different directories though, so a janitorial cleanup would be
 # TODO: get rid of the shortform:longform language names when assembling the autocorr files
-$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/acor_%.dat : \
+$(gb_CustomTarget_workdir)/extras/source/autocorr/acor_%.dat : \
         $$(addprefix \
-            $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/$$(call extras_AUTOCORR_SHORTLANG,$$*)/,\
+            $(gb_CustomTarget_workdir)/extras/source/autocorr/$$(call extras_AUTOCORR_SHORTLANG,$$*)/,\
                 mimetype \
                 $$(call extras_AUTOCORR_XMLFILES_LANG,$$(call extras_AUTOCORR_SHORTLANG,$$*))) \
 		| $(call gb_ExternalExecutable_get_dependencies,python)
diff --git a/extras/CustomTarget_autotextshare.mk b/extras/CustomTarget_autotextshare.mk
index 318e05fe21fd..142ffafcbffe 100644
--- a/extras/CustomTarget_autotextshare.mk
+++ b/extras/CustomTarget_autotextshare.mk
@@ -3637,31 +3637,31 @@ extras_AUTOTEXTSHARE_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras
 .SECONDEXPANSION:
 # secondexpansion since the patterns not just cover a filename portion, but also include a
 # directory portion withdifferent number of elements
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%/mimetype : \
-        | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*/mimetype).dir
+$(gb_CustomTarget_workdir)/extras/source/autotext/%/mimetype : \
+        | $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/$$*/mimetype).dir
 	$(call gb_Output_announce,autotext/$*/mimetype,$(true),TCH,1)
 	$(call gb_Trace_StartRange,autotext/$*/mimetype,TCH)
 	touch $@
 	$(call gb_Trace_EndRange,autotext/$*/mimetype,TCH)
 
 # rule for *.rdf, *.svm, *.png, …
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/% : $(SRCDIR)/extras/source/autotext/lang/% \
-        | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*).dir
+$(gb_CustomTarget_workdir)/extras/source/autotext/% : $(SRCDIR)/extras/source/autotext/lang/% \
+        | $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/$$*).dir
 	$(call gb_Output_announce,autotext/$*,$(true),CPY,1)
 	$(call gb_Trace_StartRange,autotext/$*,CPY)
 	cp $< $@
 	$(call gb_Trace_EndRange,autotext/$*,CPY)
 
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.xml : $(SRCDIR)/extras/source/autotext/lang/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/autotext/%.xml : $(SRCDIR)/extras/source/autotext/lang/%.xml \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
-          $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*.xml).dir
+          $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/$$*.xml).dir
 	$(call gb_Output_announce,autotext/$*.xml,$(true),XSL,1)
 	$(call gb_Trace_StartRange,autotext/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
 	$(call gb_Trace_EndRange,autotext/$*.xml,XSL)
 
-$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau : \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/autotext)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/autotext/%.bau : \
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/autotext/$$*/,\
             mimetype $$(call extras_AUTOTEXTSHARE_XMLFILES_RELATIVE,$$*))
 	$(call gb_Output_announce,autotext/$*.bau,$(true),ZIP,2)
 	$(call gb_Trace_StartRange,autotext/$*.bau,ZIP)
diff --git a/extras/CustomTarget_autotextuser.mk b/extras/CustomTarget_autotextuser.mk
index 5ac07ccb6c19..f81fb07250ad 100644
--- a/extras/CustomTarget_autotextuser.mk
+++ b/extras/CustomTarget_autotextuser.mk
@@ -19,23 +19,23 @@ extras_AUTOTEXTUSER_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_
 .SECONDEXPANSION:
 # secondexpansion since the patterns not just cover a filename portion, but also include a
 # directory portion withdifferent number of elements
-$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%/mimetype : \
-        | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$$*/mimetype).dir
+$(gb_CustomTarget_workdir)/extras/source/autotext/user/%/mimetype : \
+        | $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/user/$$*/mimetype).dir
 	$(call gb_Output_announce,autotext/user/$*/mimetype,$(true),TCH,1)
 	$(call gb_Trace_StartRange,autotext/user/$*/mimetype,TCH)
 	touch $@
 	$(call gb_Trace_EndRange,autotext/user/$*/mimetype,TCH)
 
-$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/autotext/user/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
-          $$(dir $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$$*.xml).dir
+          $$(dir $(gb_CustomTarget_workdir)/extras/source/autotext/user/$$*.xml).dir
 	$(call gb_Output_announce,autotext/user/$*.xml,$(true),XSL,1)
 	$(call gb_Trace_StartRange,autotext/user/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
 	$(call gb_Trace_EndRange,autotext/user/$*.xml,XSL)
 
-$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.bau : \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/autotext/user/%.bau : \
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/autotext/user/$$*/,\
             mimetype $$(call extras_AUTOTEXTUSER_XMLFILES_RELATIVE,$$*))
 	$(call gb_Output_announce,autotext/user/$*.bau,$(true),ZIP,2)
 	$(call gb_Trace_StartRange,autotext/user/$*.bau,ZIP)
diff --git a/extras/CustomTarget_gallsystem.mk b/extras/CustomTarget_gallsystem.mk
index 434cbb6e17dd..cab25d047f64 100644
--- a/extras/CustomTarget_gallsystem.mk
+++ b/extras/CustomTarget_gallsystem.mk
@@ -15,7 +15,7 @@ $(eval $(call gb_CustomTarget_register_targets,extras/gallsysstr,\
 ))
 
 $(eval $(call gb_CustomTarget_ulfex_rule,\
-    $(call gb_CustomTarget_get_workdir,extras/gallsysstr)/extras_gallsystem.ulf,\
+    $(gb_CustomTarget_workdir)/extras/gallsysstr/extras_gallsystem.ulf,\
     $(SRCDIR)/extras/source/gallery/share/gallery_names.ulf,\
     $(foreach lang,$(gb_TRANS_LANGS),\
         $(gb_POLOCATION)/$(lang)/extras/source/gallery/share.po)))
@@ -23,8 +23,8 @@ $(eval $(call gb_CustomTarget_ulfex_rule,\
 # desktop-translate.py is ugly af/doesn't play nice with make dependencies.
 # It expects the target filename to exist and modifies it, so do the hack with own
 # temporary dir
-$(call gb_CustomTarget_get_workdir,extras/gallsysstr)/%.str : \
-                    $(call gb_CustomTarget_get_workdir,extras/gallsysstr)/extras_gallsystem.ulf \
+$(gb_CustomTarget_workdir)/extras/gallsysstr/%.str : \
+                    $(gb_CustomTarget_workdir)/extras/gallsysstr/extras_gallsystem.ulf \
                     $(SRCDIR)/extras/source/gallery/gallery_system/dummy.str \
                     $(call gb_ExternalExecutable_get_dependencies,python) \
                     $(SRCDIR)/solenv/bin/desktop-translate.py
diff --git a/extras/CustomTarget_glade.mk b/extras/CustomTarget_glade.mk
index b25e095c532b..b4e718b0b56c 100644
--- a/extras/CustomTarget_glade.mk
+++ b/extras/CustomTarget_glade.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,extras/glade))
 # Rules
 #
 
-$(call gb_CustomTarget_get_workdir,extras/source/glade)/libreoffice-catalog.xml : \
+$(gb_CustomTarget_workdir)/extras/source/glade/libreoffice-catalog.xml : \
         $(SRCDIR)/extras/source/glade/libreoffice-catalog.xml.in \
         $(SRCDIR)/extras/source/glade/makewidgetgroup.xslt \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc)
diff --git a/extras/CustomTarget_opensymbol.mk b/extras/CustomTarget_opensymbol.mk
index c68480931044..b726dc7cc2bf 100644
--- a/extras/CustomTarget_opensymbol.mk
+++ b/extras/CustomTarget_opensymbol.mk
@@ -12,14 +12,14 @@ $(eval $(call gb_CustomTarget_CustomTarget,extras/fonts))
 $(eval $(call gb_CustomTarget_register_targets,extras/fonts,opens___.ttf))
 
 ifneq (,$(FONTFORGE))
-$(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \
+$(gb_CustomTarget_workdir)/extras/fonts/opens___.ttf : \
 		$(SRCDIR)/extras/source/truetype/symbol/OpenSymbol.sfd
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),FNT,1)
 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),FNT)
 	$(FONTFORGE) -lang=ff -c 'Open($$1); Generate($$2)' $< $@
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),FNT)
 else
-$(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \
+$(gb_CustomTarget_workdir)/extras/fonts/opens___.ttf : \
 		$(TARFILE_LOCATION)/$(OPENSYMBOL_TTF)
 	cp $< $@
 endif
diff --git a/extras/CustomTarget_templates.mk b/extras/CustomTarget_templates.mk
index 5266a6917638..b17ce37df9eb 100644
--- a/extras/CustomTarget_templates.mk
+++ b/extras/CustomTarget_templates.mk
@@ -48,31 +48,31 @@ extras_TEMPLATES_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_TEM
 # secondexpansion since the patterns not just cover a filename portion, but also include a
 # directory portion with different number of elements
 # copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates)/% : $(SRCDIR)/extras/source/templates/% \
-        | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*).dir
+$(gb_CustomTarget_workdir)/extras/source/templates/% : $(SRCDIR)/extras/source/templates/% \
+        | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/$$*).dir
 	$(call gb_Output_announce,templates/$*,$(true),CPY,1)
 	$(call gb_Trace_StartRange,templates/$*,CPY)
 	cp $< $@
 	$(call gb_Trace_EndRange,templates/$*,CPY)
 
 # test and copy xml files
-$(call gb_CustomTarget_get_workdir,extras/source/templates)/%.xml : $(SRCDIR)/extras/source/templates/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/templates/%.xml : $(SRCDIR)/extras/source/templates/%.xml \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
-          $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*.xml).dir
+          $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/$$*.xml).dir
 	$(call gb_Output_announce,templates/$*.xml,$(true),XSL,1)
 	$(call gb_Trace_StartRange,templates/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
 	$(call gb_Trace_EndRange,templates/$*.xml,XSL)
 
 # zip files to OTT
-$(call gb_CustomTarget_get_workdir,extras/source/templates)/%.ott : \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/%.ott : \
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
             mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
             styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
             META-INF/manifest.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
             Thumbnails/thumbnail.png $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) )
 	$(call gb_Output_announce,templates/$*.ott,$(true),ZIP,2)
 	$(call gb_Trace_StartRange,templates/$*.ott,ZIP)
@@ -86,16 +86,16 @@ $(call gb_CustomTarget_get_workdir,extras/source/templates)/%.ott : \
 	$(call gb_Trace_EndRange,templates/$*.ott,ZIP)
 
 # zip files to OTG
-$(call gb_CustomTarget_get_workdir,extras/source/templates)/%.otg : \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/%.otg : \
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
             mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
             content.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
             styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
             META-INF/manifest.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\
             Thumbnails/thumbnail.png $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) )
 	$(call gb_Output_announce,templates/$*.otg,$(true),ZIP,2)
 	$(call gb_Trace_StartRange,templates/$*.otg,ZIP)
diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index 02b72b86f086..fd8053c42170 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -121,33 +121,33 @@ extras_PRESNT_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_PRESEN
 # secondexpansion since the patterns not just cover a filename portion, but also include a
 # directory portion withdifferent number of elements
 # copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/% : $(SRCDIR)/extras/source/templates/presnt/% \
-        | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*).dir
+$(gb_CustomTarget_workdir)/extras/source/templates/presnt/% : $(SRCDIR)/extras/source/templates/presnt/% \
+        | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*).dir
 	$(call gb_Output_announce,templates/presnt/$*,$(true),CPY,1)
 	$(call gb_Trace_StartRange,templates/presnt/$*,CPY)
 	cp $< $@
 	$(call gb_Trace_EndRange,templates/presnt/$*,CPY)
 
 # test and copy xml files
-$(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.xml : $(SRCDIR)/extras/source/templates/presnt/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/templates/presnt/%.xml : $(SRCDIR)/extras/source/templates/presnt/%.xml \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
-          $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*.xml).dir
+          $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*.xml).dir
 	$(call gb_Output_announce,templates/presnt/$*.xml,$(true),XSL,1)
 	$(call gb_Trace_StartRange,templates/presnt/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
 	$(call gb_Trace_EndRange,templates/presnt/$*.xml,XSL)
 
 # zip files to OTP
-$(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.otp : \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/presnt/%.otp : \
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
             mimetype $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
             content.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
             styles.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
             META-INF/manifest.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\
             Thumbnails/thumbnail.png $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) )
 	$(call gb_Output_announce,templates/presnt/$*.otp,$(true),ZIP,2)
 	$(call gb_Trace_StartRange,templates/presnt/$*.otp,ZIP)
diff --git a/extras/CustomTarget_tplwizard.mk b/extras/CustomTarget_tplwizard.mk
index 617e56b007ad..3e54d0b5e99c 100644
--- a/extras/CustomTarget_tplwizard.mk
+++ b/extras/CustomTarget_tplwizard.mk
@@ -176,33 +176,33 @@ extras_WIZARD_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_WIZARD
 # secondexpansion since the patterns not just cover a filename portion, but also include a
 # directory portion with different number of elements
 # copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/% : $(SRCDIR)/extras/source/templates/wizard/% \
-        | $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*).dir
+$(gb_CustomTarget_workdir)/extras/source/templates/wizard/% : $(SRCDIR)/extras/source/templates/wizard/% \
+        | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*).dir
 	$(call gb_Output_announce,templates/wizard/$*,$(true),CPY,1)
 	$(call gb_Trace_StartRange,templates/wizard/$*,CPY)
 	cp $< $@
 	$(call gb_Trace_EndRange,templates/wizard/$*,CPY)
 
 # test and copy xml files
-$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.xml : $(SRCDIR)/extras/source/templates/wizard/%.xml \
+$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.xml : $(SRCDIR)/extras/source/templates/wizard/%.xml \
         | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
-          $$(dir $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*.xml).dir
+          $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*.xml).dir
 	$(call gb_Output_announce,templates/wizard/$*.xml,$(true),XSL,1)
 	$(call gb_Trace_StartRange,templates/wizard/$*.xml,XSL)
 	$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $<
 	$(call gb_Trace_EndRange,templates/wizard/$*.xml,XSL)
 
 # zip files to OTT
-$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.ott : \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ott : \
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             mimetype $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             content.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             settings.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) )
 	$(call gb_Output_announce,templates/wizard/$*.ott,$(true),ZIP,2)
 	$(call gb_Trace_StartRange,templates/wizard/$*.ott,ZIP)
@@ -216,16 +216,16 @@ $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.ott : \
 	$(call gb_Trace_EndRange,templates/wizard/$*.ott,ZIP)
 
 # zip files to OTS
-$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/%.ots : \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ots : \
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             mimetype $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             content.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             settings.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \
-        $$(addprefix $(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)/$$*/,\
+        $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\
             META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) )
 	$(call gb_Output_announce,templates/wizard/$*.ots,$(true),ZIP,2)
 	$(call gb_Trace_StartRange,templates/wizard/$*.ots,ZIP)
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index b9a50b3ed230..db8b85c81309 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autocorr)))
+$(eval $(call gb_Package_Package,extras_autocorr,$(gb_CustomTarget_workdir)/extras/source/autocorr))
 
 $(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr,\
 	acor_af-ZA.dat \
diff --git a/extras/Package_autotextuser.mk b/extras/Package_autotextuser.mk
index bb398b335ed1..ba6c8a38ef2d 100644
--- a/extras/Package_autotextuser.mk
+++ b/extras/Package_autotextuser.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_autotextuser,$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)))
+$(eval $(call gb_Package_Package,extras_autotextuser,$(gb_CustomTarget_workdir)/extras/source/autotext/user))
 
 $(eval $(call gb_Package_add_files,extras_autotextuser,$(LIBO_SHARE_PRESETS_FOLDER)/autotext,\
 	mytexts.bau \
diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk
index 8d2d23cbed6b..01ee89f429ec 100644
--- a/extras/Package_fonts.mk
+++ b/extras/Package_fonts.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_fonts,$(call gb_CustomTarget_get_workdir,extras/fonts)))
+$(eval $(call gb_Package_Package,extras_fonts,$(gb_CustomTarget_workdir)/extras/fonts))
 
 $(eval $(call gb_Package_use_customtarget,extras_fonts,extras/fonts))
 
diff --git a/extras/Package_gallsystemstr.mk b/extras/Package_gallsystemstr.mk
index bcae3f5aa8bc..a36c7ffadc39 100644
--- a/extras/Package_gallsystemstr.mk
+++ b/extras/Package_gallsystemstr.mk
@@ -8,7 +8,7 @@
 #
 
 # defining extra package for that is a little hacky - maybe use PackageSet instead?
-$(eval $(call gb_Package_Package,extras_gallsystemstr,$(call gb_CustomTarget_get_workdir,extras/gallsysstr)))
+$(eval $(call gb_Package_Package,extras_gallsystemstr,$(gb_CustomTarget_workdir)/extras/gallsysstr))
 $(eval $(call gb_Package_use_customtarget,extras_gallsystemstr,extras/gallsysstr))
 
 $(eval $(call gb_Package_add_files,extras_gallsystemstr,$(LIBO_SHARE_FOLDER)/gallery,\
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
index 1590550f3270..f58af81e902e 100644
--- a/extras/Package_glade.mk
+++ b/extras/Package_glade.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade)))
+$(eval $(call gb_Package_Package,extras_glade,$(gb_CustomTarget_workdir)/extras/source/glade))
 
 $(eval $(call gb_Package_add_file,extras_glade,$(LIBO_SHARE_FOLDER)/glade/libreoffice-catalog.xml,libreoffice-catalog.xml))
 
diff --git a/extras/Package_resource_fonts.mk b/extras/Package_resource_fonts.mk
index e90e46dfddd4..15c0e897808d 100644
--- a/extras/Package_resource_fonts.mk
+++ b/extras/Package_resource_fonts.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,resource_fonts,$(call gb_CustomTarget_get_workdir,extras/fonts)))
+$(eval $(call gb_Package_Package,resource_fonts,$(gb_CustomTarget_workdir)/extras/fonts))
 
 $(eval $(call gb_Package_use_customtarget,resource_fonts,extras/fonts))
 
diff --git a/extras/Package_templates.mk b/extras/Package_templates.mk
index 4ffdaa950d6a..fd637cd7578e 100644
--- a/extras/Package_templates.mk
+++ b/extras/Package_templates.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_templates,$(call gb_CustomTarget_get_workdir,extras/source/templates)))
+$(eval $(call gb_Package_Package,extras_templates,$(gb_CustomTarget_workdir)/extras/source/templates))
 
 $(eval $(call gb_Package_add_files_with_dir,extras_templates,$(LIBO_SHARE_FOLDER)/template/common,\
 	officorr/Modern_business_letter_sans_serif.ott \
diff --git a/extras/Package_tplpresnt.mk b/extras/Package_tplpresnt.mk
index 34f20f61fcf5..cb3cf2562245 100644
--- a/extras/Package_tplpresnt.mk
+++ b/extras/Package_tplpresnt.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_tplpresnt,$(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)))
+$(eval $(call gb_Package_Package,extras_tplpresnt,$(gb_CustomTarget_workdir)/extras/source/templates/presnt))
 
 $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
 	Candy.otp \
diff --git a/extras/Package_tplwizard.mk b/extras/Package_tplwizard.mk
index 432e6a91bb3c..61bf401f75d7 100644
--- a/extras/Package_tplwizard.mk
+++ b/extras/Package_tplwizard.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,extras_tplwizard,$(call gb_CustomTarget_get_workdir,extras/source/templates/wizard)))
+$(eval $(call gb_Package_Package,extras_tplwizard,$(gb_CustomTarget_workdir)/extras/source/templates/wizard))
 
 $(eval $(call gb_Package_add_files_with_dir,extras_tplwizard,$(LIBO_SHARE_FOLDER)/template/common/wizard,\
     agenda/10grey.ott \