Try to fix cross-compilation

Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions.

Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT.

Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255

56 files changed, 56 insertions, 56 deletions

diff --git a/extras/ExternalPackage_accessoriesgallery.mk b/extras/ExternalPackage_accessoriesgallery.mk
index 505965147451..efa6c705451b 100644
--- a/extras/ExternalPackage_accessoriesgallery.mk
+++ b/extras/ExternalPackage_accessoriesgallery.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallery,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallery,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallery,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,$(LIBO_SHARE_FOLDER)/gallery,\
 	accessories/sg1010.sdg \
diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
index cb7e495d5275..1961f4cc5dd7 100644
--- a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
+++ b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
@@ -10,7 +10,7 @@
 #$(eval $(call gb_Package_Package,extras_accessoriesgallerydrawspeople,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawspeople,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\
 	accessories/Draws/People/Baboo1.png \
diff --git a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
index ebb03afb791e..8a81b568a2a3 100644
--- a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
+++ b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelementsbullets2,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,$(LIBO_SHARE_FOLDER)/gallery/Elements/Bullets2,\
 	accessories/Elements/Bullets2/amethyst.arrow.png \
diff --git a/extras/ExternalPackage_accessoriesgallerynonfree.mk b/extras/ExternalPackage_accessoriesgallerynonfree.mk
index 4478ec434bb3..ea5d87288d63 100644
--- a/extras/ExternalPackage_accessoriesgallerynonfree.mk
+++ b/extras/ExternalPackage_accessoriesgallerynonfree.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerynonfree,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerynonfree,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerynonfree,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,$(LIBO_SHARE_FOLDER)/gallery,\
 	accessories-nonfree/sg600.sdg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
index f8859c9aa6d6..72c265c884fd 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosbuildings,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosbuildings,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosbuildings,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,$(LIBO_SHARE_FOLDER)/gallery/Photos/Buildings,\
 	accessories/Photos/Buildings/ArkSoft0408010009.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
index 2ff6d8356740..6af42c3e71c2 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscelebration,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscelebration,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscelebration,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,$(LIBO_SHARE_FOLDER)/gallery/Photos/Celebration,\
 	accessories/Photos/Celebration/JS_PDPhO_fireworks_burst.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
index 3b51346b1d97..82dc8ccdcd3a 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscities,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscities,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscities,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,$(LIBO_SHARE_FOLDER)/gallery/Photos/Cities,\
 	accessories/Photos/Cities/ArkSoft0507170040.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
index 0465ec448be6..8bf04c056f7b 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfauna,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfauna,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfauna,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,$(LIBO_SHARE_FOLDER)/gallery/Photos/Fauna,\
 	accessories/Photos/Fauna/ArkSoft0407030001.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
index 012517412daa..9cfbae6594c7 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosflowers,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosflowers,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosflowers,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,$(LIBO_SHARE_FOLDER)/gallery/Photos/Flowers,\
 	accessories/Photos/Flowers/1481157185_28ea113529_o.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
index 55bda0e360bd..7398ddb287fa 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfoodsanddrinks,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfoodsanddrinks,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfoodsanddrinks,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,$(LIBO_SHARE_FOLDER)/gallery/Photos/FoodsandDrinks,\
 	accessories/Photos/FoodsandDrinks/JS_PDPhO_beer.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
index 25e9864930cd..58215c825227 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoshumans,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoshumans,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoshumans,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,$(LIBO_SHARE_FOLDER)/gallery/Photos/Humans,\
 	accessories/Photos/Humans/1471425079_b3b53bdf5f_b.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
index b9ce827e929b..0f8fd559ccfb 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoslandscapes,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoslandscapes,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoslandscapes,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,$(LIBO_SHARE_FOLDER)/gallery/Photos/Landscapes,\
 	accessories/Photos/Landscapes/ArkSoft0405010010.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
index 07b0682ed83e..ee731b315c9f 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosobjects,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosobjects,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosobjects,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,$(LIBO_SHARE_FOLDER)/gallery/Photos/Objects,\
 	accessories/Photos/Objects/JS_PDPhO_dragon_celebration.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
index ca712fab942c..5cf1e84702f6 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosplants,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosplants,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosplants,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,$(LIBO_SHARE_FOLDER)/gallery/Photos/Plants,\
 	accessories/Photos/Plants/ArkSoft0405020018.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
index 9756690b6903..ad0ff113429e 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosspace,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosspace,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosspace,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,$(LIBO_SHARE_FOLDER)/gallery/Photos/Space,\
 	accessories/Photos/Space/Wikimedia_Space_120px-Atlantis_taking_off_on_STS-27.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
index 9b57f746cc3d..6be90e09c04e 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosstatues,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosstatues,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosstatues,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,$(LIBO_SHARE_FOLDER)/gallery/Photos/Statues,\
 	accessories/Photos/Statues/ArkSoft0507170027.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
index ac2323d97352..0b0aac66d08c 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotostravel,gallery-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotostravel,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotostravel,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,$(LIBO_SHARE_FOLDER)/gallery/Photos/Travel,\
 	accessories/Photos/Travel/JS_PDPhO_balloons_festival.jpg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommon.mk b/extras/ExternalPackage_accessoriestemplatescommon.mk
index 5b1c58545423..bdc80af62a54 100644
--- a/extras/ExternalPackage_accessoriestemplatescommon.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommon.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommon,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommon,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommon,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommon,$(LIBO_SHARE_FOLDER)/template/common,\
 	templates/common/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
index 558d880dd008..de8a553ba66d 100644
--- a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommoneducate,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommoneducate,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommoneducate,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommoneducate,$(LIBO_SHARE_FOLDER)/template/common/educate,\
 	templates/common/educate/A4-chequered.otg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
index ae287dd3073a..e8008783942f 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonfinance,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonfinance,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonfinance,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonfinance,$(LIBO_SHARE_FOLDER)/template/common/finance,\
 	templates/common/finance/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonforms.mk b/extras/ExternalPackage_accessoriestemplatescommonforms.mk
index 99b23c3bd24c..139820d7f402 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonforms.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonforms.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonforms,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonforms,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonforms,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonforms,$(LIBO_SHARE_FOLDER)/template/common/forms,\
 	templates/common/forms/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
index 7f60b328f3da..d5bf926b8dde 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlabels,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlabels,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlabels,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlabels,$(LIBO_SHARE_FOLDER)/template/common/labels,\
 	templates/common/labels/24_port_patch_text.otg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
index 4d4046084235..9e19b4b286d4 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlayout,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlayout,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlayout,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlayout,$(LIBO_SHARE_FOLDER)/template/common/layout,\
 	templates/common/layout/31407-squares.otp \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
index b6528235a1d0..3b548d95bd4b 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonmisc,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonmisc,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonmisc,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonmisc,$(LIBO_SHARE_FOLDER)/template/common/misc,\
 	templates/common/misc/White_Notebook_Paper_legal.ott \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
index 6caaf03efcf5..9cdbc3a49e0a 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonofficorr,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonofficorr,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonofficorr,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
 	templates/common/officorr/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
index 185d30925643..09d5815029f0 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonoffimisc,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonoffimisc,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonoffimisc,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonoffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
 	templates/common/offimisc/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
index 134df5f3bc90..fcb2ca890615 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpersonal,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpersonal,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpersonal,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\
 	templates/common/personal/szivesoldal.otg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
index f21808ce5332..732043f7e629 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpresent,templates-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpresent,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpresent,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpresent,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
 	templates/common/presnt/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_extra_fonts.mk b/extras/ExternalPackage_extra_fonts.mk
index 6ad5bf7e2ed3..f82e560fc55d 100644
--- a/extras/ExternalPackage_extra_fonts.mk
+++ b/extras/ExternalPackage_extra_fonts.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,extras_extra_fonts,fonts-pack))
 
-$(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack))
 
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index 4e4a1eae4811..d6d65dce704b 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autotext)))
 
-$(eval $(call gb_Package_set_outdir,extras_autocorr,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_autocorr,$(INSTROOT)))
 
 $(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 56b7761bace2..64fd70d7762d 100644
--- a/extras/Package_autotextuser.mk
+++ b/extras/Package_autotextuser.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/autotext))
 
-$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_autotextuser,$(LIBO_SHARE_PRESETS_FOLDER)/autotext,\
 	mytexts.bau \
diff --git a/extras/Package_cfgsrvbitmapunx.mk b/extras/Package_cfgsrvbitmapunx.mk
index fcc34fb97127..483617d1351a 100644
--- a/extras/Package_cfgsrvbitmapunx.mk
+++ b/extras/Package_cfgsrvbitmapunx.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps))
 
-$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,$(LIBO_SHARE_FOLDER)/config,\
 	psetupl.xpm \
diff --git a/extras/Package_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk
index 0a711ee9cd47..7e90279cd759 100644
--- a/extras/Package_cfgsrvnolang.mk
+++ b/extras/Package_cfgsrvnolang.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_cfgsrvnolang,$(SRCDIR)/extras/source/misc_config))
 
-$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,$(LIBO_SHARE_FOLDER)/config,\
 	wizard/form/styles/beige.css \
diff --git a/extras/Package_cfgusr.mk b/extras/Package_cfgusr.mk
index 2381f5dcdba3..41685ac64c98 100644
--- a/extras/Package_cfgusr.mk
+++ b/extras/Package_cfgusr.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_cfgusr,$(SRCDIR)/extras/source/misc_config))
 
-$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_cfgusr,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
     autotbl.fmt \
diff --git a/extras/Package_database.mk b/extras/Package_database.mk
index cf89b5a88c0f..4d1c47e321cf 100644
--- a/extras/Package_database.mk
+++ b/extras/Package_database.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_database,$(SRCDIR)/extras/source/database))
 
-$(eval $(call gb_Package_set_outdir,extras_database,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_database,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_database,$(LIBO_SHARE_PRESETS_FOLDER)/database,\
 	biblio.odb \
diff --git a/extras/Package_databasebiblio.mk b/extras/Package_databasebiblio.mk
index 042af2d7ced9..459aa2520578 100644
--- a/extras/Package_databasebiblio.mk
+++ b/extras/Package_databasebiblio.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_databasebiblio,$(SRCDIR)/extras/source/database))
 
-$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_databasebiblio,$(LIBO_SHARE_PRESETS_FOLDER)/database/biblio,\
 	biblio.dbf \
diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk
index dfdd4d3d97e7..35210126a438 100644
--- a/extras/Package_fonts.mk
+++ b/extras/Package_fonts.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras))
 
-$(eval $(call gb_Package_set_outdir,extras_fonts,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_fonts,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf))
 
diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk
index 0711b5298094..3044384c574c 100644
--- a/extras/Package_gallbullets.mk
+++ b/extras/Package_gallbullets.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
 
-$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_gallbullets,$(LIBO_SHARE_FOLDER)/gallery/bullets,\
 	blkpearl.gif \
diff --git a/extras/Package_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk
index 792004f2d9f0..4dadefabe81f 100644
--- a/extras/Package_gallhtmlexpo.mk
+++ b/extras/Package_gallhtmlexpo.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
 
-$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_gallhtmlexpo,$(LIBO_SHARE_FOLDER)/gallery/htmlexpo,\
 	bludown.gif \
diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index 858692cbfe63..964a5bcc6c1b 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gallery/gallery_mytheme))
 
-$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
 	sg30.sdv \
diff --git a/extras/Package_gallroot.mk b/extras/Package_gallroot.mk
index 30981b6344ea..b0b2fb722901 100644
--- a/extras/Package_gallroot.mk
+++ b/extras/Package_gallroot.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery))
 
-$(eval $(call gb_Package_set_outdir,extras_gallroot,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_gallroot,$(LIBO_SHARE_FOLDER)/gallery,\
 	apples.gif \
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index cd901bedbbf9..5a29baaf128e 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
 
-$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
 	sg1.sdg \
diff --git a/extras/Package_gallwwwback.mk b/extras/Package_gallwwwback.mk
index bcee303a045c..a989b1118639 100644
--- a/extras/Package_gallwwwback.mk
+++ b/extras/Package_gallwwwback.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gallery/www-back))
 
-$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_gallwwwback,$(LIBO_SHARE_FOLDER)/gallery/www-back,\
 	aqua.jpg \
diff --git a/extras/Package_gallwwwgraf.mk b/extras/Package_gallwwwgraf.mk
index e26d045c15e6..33725d4b74e5 100644
--- a/extras/Package_gallwwwgraf.mk
+++ b/extras/Package_gallwwwgraf.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf))
 
-$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_gallwwwgraf,$(LIBO_SHARE_FOLDER)/gallery/www-graf,\
 	bluat.gif \
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
index 192615f668db..2dbce19501da 100644
--- a/extras/Package_glade.mk
+++ b/extras/Package_glade.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade)))
 
-$(eval $(call gb_Package_set_outdir,extras_glade,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_glade,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_file,extras_glade,$(LIBO_SHARE_FOLDER)/glade/libreoffice-catalog.xml,libreoffice-catalog.xml))
 
diff --git a/extras/Package_labels.mk b/extras/Package_labels.mk
index 9d188d7e03d4..66b640873721 100644
--- a/extras/Package_labels.mk
+++ b/extras/Package_labels.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels))
 
-$(eval $(call gb_Package_set_outdir,extras_labels,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_labels,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_file,extras_labels,$(LIBO_SHARE_FOLDER)/labels/labels.xml,labels.xml))
 
diff --git a/extras/Package_newfiles.mk b/extras/Package_newfiles.mk
index 064face1631c..7517c7b0b4f8 100644
--- a/extras/Package_newfiles.mk
+++ b/extras/Package_newfiles.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_newfiles,$(SRCDIR)/extras/source/shellnew))
 
-$(eval $(call gb_Package_set_outdir,extras_newfiles,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_newfiles,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_newfiles,$(LIBO_SHARE_FOLDER)/template/shellnew,\
     soffice.odg \
diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index 9cb6a9f95e26..f9aacba27a68 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palettes))
 
-$(eval $(call gb_Package_set_outdir,extras_palettes,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_palettes,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_palettes,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
 	arrowhd.soe \
diff --git a/extras/Package_tpllayoutimpr.mk b/extras/Package_tpllayoutimpr.mk
index fd6cda27cbba..255ee1b47cc3 100644
--- a/extras/Package_tpllayoutimpr.mk
+++ b/extras/Package_tpllayoutimpr.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_tpllayoutimpr,$(SRCDIR)/extras/source/templates/layout))
 
-$(eval $(call gb_Package_set_outdir,extras_tpllayoutimpr,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tpllayoutimpr,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_tpllayoutimpr,$(LIBO_SHARE_FOLDER)/template/common/layout,\
 	AbstractGreen.otp \
diff --git a/extras/Package_tplwizagenda.mk b/extras/Package_tplwizagenda.mk
index 654a5ee5039d..cbb8f4fc6978 100644
--- a/extras/Package_tplwizagenda.mk
+++ b/extras/Package_tplwizagenda.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_tplwizagenda,$(SRCDIR)/extras/source/templates/wizard/agenda))
 
-$(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_tplwizagenda,$(LIBO_SHARE_FOLDER)/template/common/wizard/agenda,\
     10grey.ott \
diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk
index b6c47578f0de..e29068bc9f88 100644
--- a/extras/Package_tplwizbitmap.mk
+++ b/extras/Package_tplwizbitmap.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_tplwizbitmap,$(SRCDIR)/extras/source/templates/wizard/bitmap))
 
-$(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/template/wizard/bitmap,\
 	cancel_down.bmp \
diff --git a/extras/Package_tplwizdesktop.mk b/extras/Package_tplwizdesktop.mk
index 11776bb02b4b..1081f20b8ac2 100644
--- a/extras/Package_tplwizdesktop.mk
+++ b/extras/Package_tplwizdesktop.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_tplwizdesktop,$(SRCDIR)/extras/source/templates/wizard/desktop))
 
-$(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_tplwizdesktop,$(LIBO_SHARE_FOLDER)/template/common/internal,\
 	html.stw \
diff --git a/extras/Package_tplwizfax.mk b/extras/Package_tplwizfax.mk
index 2ed8936e3c99..be0e87a3a234 100644
--- a/extras/Package_tplwizfax.mk
+++ b/extras/Package_tplwizfax.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_tplwizfax,$(SRCDIR)/extras/source/templates/wizard/fax))
 
-$(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_tplwizfax,$(LIBO_SHARE_FOLDER)/template/common/wizard/fax,\
     bus-classic_f.ott \
diff --git a/extras/Package_tplwizletter.mk b/extras/Package_tplwizletter.mk
index 625596307d81..386800f049a9 100644
--- a/extras/Package_tplwizletter.mk
+++ b/extras/Package_tplwizletter.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_tplwizletter,$(SRCDIR)/extras/source/templates/wizard/letter))
 
-$(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_tplwizletter,$(LIBO_SHARE_FOLDER)/template/common/wizard/letter,\
     bus-elegant_l.ott \
diff --git a/extras/Package_tplwizreport.mk b/extras/Package_tplwizreport.mk
index 93517d50c9e7..d7a2ee5ffd65 100644
--- a/extras/Package_tplwizreport.mk
+++ b/extras/Package_tplwizreport.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_tplwizreport,$(SRCDIR)/extras/source/templates/wizard/report))
 
-$(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_tplwizreport,$(LIBO_SHARE_FOLDER)/template/common/wizard/report,\
     cnt-011.ott \
diff --git a/extras/Package_tplwizstyles.mk b/extras/Package_tplwizstyles.mk
index f5b02647278a..9f8b64c5bcc5 100644
--- a/extras/Package_tplwizstyles.mk
+++ b/extras/Package_tplwizstyles.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extras_tplwizstyles,$(SRCDIR)/extras/source/templates/wizard/styles))
 
-$(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_tplwizstyles,$(LIBO_SHARE_FOLDER)/template/common/wizard/styles,\
 	blackberry.ots \