1 files changed, 1 insertions, 1 deletions
diff --git a/offapi/com/sun/star/ui/ItemDescriptor.idl b/offapi/com/sun/star/ui/ItemDescriptor.idl
index 8732f300b96d..b6e9c2404330 100644
--- a/offapi/com/sun/star/ui/ItemDescriptor.idl
+++ b/offapi/com/sun/star/ui/ItemDescriptor.idl
@@ -49,7 +49,7 @@ module com {  module sun {  module star {  module ui {
        You could have a menu or a toolbox working with the same item descriptor.
     </p>
 
-    @since OOo 2.0.0
+    @since OOo 2.0
 */
 service ItemDescriptor
 {
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1cc32cf120ef..8a8d06c8080c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3034,7 +3034,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_
 
 else
 
-$(call gb_ExternalExecutable_set_internal,python,$(INSTDIR)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
+$(call gb_ExternalExecutable_set_internal,python,$(gb_INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
 $(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND))
 $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3))
 
diff --git a/afms/ExternalPackage_fontunxafm.mk b/afms/ExternalPackage_fontunxafm.mk
index 84e4c91ff69d..1ed76b212448 100644
--- a/afms/ExternalPackage_fontunxafm.mk
+++ b/afms/ExternalPackage_fontunxafm.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,afms_fontunxafm,afms))
 
-$(eval $(call gb_ExternalPackage_set_outdir,afms_fontunxafm,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,afms_fontunxafm,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,$(LIBO_SHARE_FOLDER)/psprint/fontmetric,\
 	Courier-Bold.afm \
diff --git a/ct2n/ExternalPackage_ct2n.mk b/ct2n/ExternalPackage_ct2n.mk
index 68e3c92a4ab9..ed77ba84d3cf 100644
--- a/ct2n/ExternalPackage_ct2n.mk
+++ b/ct2n/ExternalPackage_ct2n.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,ct2n,ConvertTextToNumber))
 
-$(eval $(call gb_ExternalPackage_set_outdir,ct2n,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,ct2n,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,ct2n,share/extensions/ConvertTextToNumber,\
     Addons.xcu \
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
index 5d7dbf5c03ed..25fdbb6f80d3 100644
--- a/desktop/Package_branding.mk
+++ b/desktop/Package_branding.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
 
-$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,desktop_branding,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\
     $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk
index 5713d3f8b367..eed749618cb7 100644
--- a/desktop/Package_branding_custom.mk
+++ b/desktop/Package_branding_custom.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR)))
 
-$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME),\
     $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk
index c64c2bdba0e9..2d36a59d190e 100644
--- a/desktop/Package_scripts_install.mk
+++ b/desktop/Package_scripts_install.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts))
 
-$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(gb_INSTROOT)))
 
 ifneq ($(OS),WNT)
 
diff --git a/desktop/Package_soffice_bin.mk b/desktop/Package_soffice_bin.mk
index 923742697631..acc9cab86dc5 100644
--- a/desktop/Package_soffice_bin.mk
+++ b/desktop/Package_soffice_bin.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,desktop_soffice_bin,$(gb_Executable_BINDIR)))
 
-$(eval $(call gb_Package_set_outdir,desktop_soffice_bin,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,desktop_soffice_bin,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,desktop_soffice_bin,$(LIBO_BIN_FOLDER)/soffice.bin,soffice_bin$(gb_Executable_EXT)))
 
diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
index 757c6817e8f9..f1a58fef3341 100644
--- a/desktop/Package_soffice_sh.mk
+++ b/desktop/Package_soffice_sh.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice)))
 
-$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,desktop_soffice_sh,$(gb_PROGRAMDIRNAME)/soffice,soffice.sh))
 
diff --git a/extensions/Package_OOoSpotlightImporter.mk b/extensions/Package_OOoSpotlightImporter.mk
index 6cb662d24287..5423645507fb 100644
--- a/extensions/Package_OOoSpotlightImporter.mk
+++ b/extensions/Package_OOoSpotlightImporter.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extensions_OOoSpotlightImporter,$(OUTDIR)/lib))
 
-$(eval $(call gb_Package_set_outdir,extensions_OOoSpotlightImporter,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extensions_OOoSpotlightImporter,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,extensions_OOoSpotlightImporter,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents/MacOS/OOoSpotlightImporter,$(call gb_Library_get_runtime_filename,OOoSpotlightImporter)))
 
diff --git a/extensions/Package_mdibundle.mk b/extensions/Package_mdibundle.mk
index b8fc9a41306e..50ce85ee1e9b 100644
--- a/extensions/Package_mdibundle.mk
+++ b/extensions/Package_mdibundle.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,extensions_mdibundle,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter))
 
-$(eval $(call gb_Package_set_outdir,extensions_mdibundle,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extensions_mdibundle,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents,\
     Info.plist \
diff --git a/external/Package_mingw_dlls.mk b/external/Package_mingw_dlls.mk
index 52eeed8a8178..3b0f2b9a0a35 100644
--- a/external/Package_mingw_dlls.mk
+++ b/external/Package_mingw_dlls.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin))
 
-$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,mingw_dlls,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,mingw_dlls,bin,\
     $(sort $(MINGW_DLLS)) \
diff --git a/external/Package_msvc_dlls.mk b/external/Package_msvc_dlls.mk
index cbf09aa15ecb..47896f045b54 100644
--- a/external/Package_msvc_dlls.mk
+++ b/external/Package_msvc_dlls.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH)))
 
-$(eval $(call gb_Package_set_outdir,msvc_dlls,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,msvc_dlls,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\
 	$(MSVC_DLLS) \
diff --git a/extras/ExternalPackage_accessoriesgallery.mk b/extras/ExternalPackage_accessoriesgallery.mk
index 0180f707fb41..505965147451 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallery,$(gb_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 6e61d5ff4465..cb7e495d5275 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(gb_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 419e043eaad0..ebb03afb791e 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(gb_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 984fba371f7b..4478ec434bb3 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerynonfree,$(gb_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 cb6b720d0f66..f8859c9aa6d6 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosbuildings,$(gb_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 4890c8e5ce53..2ff6d8356740 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscelebration,$(gb_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 6b90457508ca..3b51346b1d97 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscities,$(gb_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 900a87b80364..0465ec448be6 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfauna,$(gb_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 dfd5febcd509..012517412daa 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosflowers,$(gb_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 b7e5f0221b1b..55bda0e360bd 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfoodsanddrinks,$(gb_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 6d5d26a58dc0..25e9864930cd 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoshumans,$(gb_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 de56f6d4be65..b9ce827e929b 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoslandscapes,$(gb_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 4f2326612e5f..07b0682ed83e 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosobjects,$(gb_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 e940d3075c65..ca712fab942c 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosplants,$(gb_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 9d8ea9dcbde7..9756690b6903 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosspace,$(gb_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 7883f39bab66..9b57f746cc3d 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosstatues,$(gb_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 b331d1468157..ac2323d97352 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotostravel,$(gb_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 2e439ea8dc25..5b1c58545423 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommon,$(gb_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 2f79d55790b5..558d880dd008 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommoneducate,$(gb_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 4499c78cbf42..ae287dd3073a 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonfinance,$(gb_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 3e9063e0f9ce..99b23c3bd24c 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonforms,$(gb_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 9140267c1eac..7f60b328f3da 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlabels,$(gb_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 c9914f0ff42e..4d4046084235 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlayout,$(gb_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 f32195db210a..b6528235a1d0 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonmisc,$(gb_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 8fc6f2b03457..6caaf03efcf5 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonofficorr,$(gb_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 8e4ee0feebe0..185d30925643 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonoffimisc,$(gb_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 3952f8653d2a..134df5f3bc90 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpersonal,$(gb_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 eb2aca268410..f21808ce5332 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpresent,$(gb_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 0b480384ffb9..6ad5bf7e2ed3 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,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(gb_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 568762a567e8..9ecd63c1d996 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_autocorr,$(gb_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 0d3847a36e04..56b7761bace2 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(gb_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 f95e5be740e5..fcc34fb97127 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(gb_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 9da56d440930..0a711ee9cd47 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(gb_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 87920e862887..2381f5dcdba3 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(gb_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 af794e57f29c..cf89b5a88c0f 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_database,$(gb_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 2517b8ab2845..042af2d7ced9 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(gb_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 6a308043aea9..dfdd4d3d97e7 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_fonts,$(gb_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 b1a6abdcdb58..0711b5298094 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(gb_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 0f782fd69def..792004f2d9f0 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(gb_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 03bffeb95a90..858692cbfe63 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(gb_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 d2076cbdf7fc..30981b6344ea 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_gallroot,$(gb_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 bc027b0ae239..cd901bedbbf9 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(gb_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 72e62f303d8c..bcee303a045c 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(gb_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 2041f15c269f..e26d045c15e6 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(gb_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 f03cb4277c55..192615f668db 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_glade,$(gb_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 ef64e5a0cd83..9d188d7e03d4 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_labels,$(gb_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 0f93a23cb485..064face1631c 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_newfiles,$(gb_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 a67681b5ad90..9cb6a9f95e26 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_palettes,$(gb_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 a6c035445e0a..fd6cda27cbba 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_tpllayoutimpr,$(gb_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 f3b4bd36a689..654a5ee5039d 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(gb_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 9ea51d3c1a66..b6c47578f0de 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(gb_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 d3cd0ff83a65..11776bb02b4b 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(gb_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 a434d5f54126..2ed8936e3c99 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(gb_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 5e71abd1c1a7..625596307d81 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(gb_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 f35264323e06..93517d50c9e7 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(gb_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 a637778d9518..f5b02647278a 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,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,extras_tplwizstyles,$(LIBO_SHARE_FOLDER)/template/common/wizard/styles,\
 	blackberry.ots \
diff --git a/filter/Package_docbook.mk b/filter/Package_docbook.mk
index 5c14376b0edd..12182e207315 100644
--- a/filter/Package_docbook.mk
+++ b/filter/Package_docbook.mk
@@ -18,7 +18,7 @@
 
 $(eval $(call gb_Package_Package,filter_docbook,$(SRCDIR)/filter/source/docbook))
 
-$(eval $(call gb_Package_set_outdir,filter_docbook,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,filter_docbook,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,filter_docbook,$(LIBO_SHARE_FOLDER)/xslt/docbook,\
 	DocBookTemplate.stw \
diff --git a/filter/Package_xhtml.mk b/filter/Package_xhtml.mk
index b2e3071fd16f..faaeca903a17 100644
--- a/filter/Package_xhtml.mk
+++ b/filter/Package_xhtml.mk
@@ -18,7 +18,7 @@
 
 $(eval $(call gb_Package_Package,filter_xhtml,$(SRCDIR)/filter/source/xslt))
 
-$(eval $(call gb_Package_set_outdir,filter_xhtml,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,filter_xhtml,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl))
 $(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl))
diff --git a/filter/Package_xslt.mk b/filter/Package_xslt.mk
index 760edb80b38c..2576f75865a6 100644
--- a/filter/Package_xslt.mk
+++ b/filter/Package_xslt.mk
@@ -18,7 +18,7 @@
 
 $(eval $(call gb_Package_Package,filter_xslt,$(SRCDIR)/filter/source/xslt))
 
-$(eval $(call gb_Package_set_outdir,filter_xslt,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,filter_xslt,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/copy.xsl,common/copy.xsl))
 $(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/math.xsl,common/math.xsl))
diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk
index 85b980dc5421..dc5a754acb8f 100644
--- a/framework/Package_dtd.mk
+++ b/framework/Package_dtd.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd))
 
-$(eval $(call gb_Package_set_outdir,framework_dtd,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,framework_dtd,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,framework_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\
 	accelerator.dtd \
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 930e66d25bc9..603fcd387570 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -67,10 +67,10 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
-		echo 'java_path=`$(INSTDIR)/ure/bin/javaldx 2>/dev/null`' && \
-		echo 'export LD_LIBRARY_PATH="$(INSTDIR)/program:$$java_path$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"' && \
+		echo 'java_path=`$(gb_INSTROOT)/ure/bin/javaldx 2>/dev/null`' && \
+		echo 'export LD_LIBRARY_PATH="$(gb_INSTROOT)/program:$$java_path$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"' && \
 		echo 'ulimit -c unlimited' && \
-		echo 'export PATH="$(INSTDIR)/program:$(INSTDIR)/ure/bin:$$PATH"' && \
+		echo 'export PATH="$(gb_INSTROOT)/program:$(gb_INSTROOT)/ure/bin:$$PATH"' && \
 		echo 'export GNOME_DISABLE_CRASH_DIALOG=1' && \
 		echo '# debugging assistance' && \
 		echo 'export SAL_DISABLE_FLOATGRAB=1' && \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index f75dc84e1997..2cd15fcfb8d0 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)))
 
-$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\
 	$(call gb_Helper_get_rcfile,bootstrap) \
diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk
index 9092ed9f742e..bd4dacbcdcdf 100644
--- a/ios/CustomTarget_LibreOffice_app.mk
+++ b/ios/CustomTarget_LibreOffice_app.mk
@@ -81,7 +81,7 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice)
 #
 # soffice.cfg
 #
-	cp -R $(INSTDIR)/share/config/soffice.cfg $(appdir)/share/config
+	cp -R $(gb_INSTROOT)/share/config/soffice.cfg $(appdir)/share/config
 #