Towards a working instdir for Mac OS X

Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X,
where it is $(INSTDIR)/LibreOffice.app/Contents.  Most stuff ends up there (so
most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK-
related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME).  (And
GeneratedPackage needed to be made more flexible, to allow for packages that go
into either of those two places.)

For Android and iOS, gb_INSTROOT probably still needs to be set.

The most obvious missing thing yet to make instdir work for Mac OS X is the
instdir/*/LibreOffice.app/Contents/ure/ vs.
instdir/*/LibreOffice.app/Contents/ure-link/ split.

Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5

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))
 

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 \

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 \

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)),\

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)) \

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)
 

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)))
 

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))
 

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)))
 

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 \

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)) \

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) \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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))
 

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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))
 

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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))
 

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))
 

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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))

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))

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 \

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' && \

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) \

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
 #
 # "registry"
 #

jvmfwk/Package_jreproperties.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
 
-$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(LIBO_URE_LIB_FOLDER)/JREProperties.class,JREProperties.class))
 

jvmfwk/Package_rcfiles.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk))
 
-$(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(gb_INSTROOT)))
 
 ifneq ($(OS),WNT)
 ifeq ($(OS),FREEBSD)

libexttextcat/ExternalPackage_fingerprint.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,libexttextcat_fingerprint,exttextcat))
 
-$(eval $(call gb_ExternalPackage_set_outdir,libexttextcat_fingerprint,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,libexttextcat_fingerprint,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_files,libexttextcat_fingerprint,$(LIBO_SHARE_FOLDER)/fingerprint,\
 	langclass/fpdb.conf \

liblangtag/ExternalPackage_liblangtag_data.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
 
-$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,liblangtag_data,$(LIBO_SHARE_FOLDER)/liblangtag,\
 	data/language-subtag-registry.xml \

librelogo/Package_librelogo.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,librelogo,$(SRCDIR)/librelogo/source))
 
-$(eval $(call gb_Package_set_outdir,librelogo,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,librelogo,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,librelogo,$(LIBO_SHARE_FOLDER)/Scripts/python/LibreLogo,\
     LibreLogo/LibreLogo.py \

librelogo/Package_librelogo_properties.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,librelogo_properties,$(call gb_CustomTarget_get_workdir,librelogo/locproperties)))
 
-$(eval $(call gb_Package_set_outdir,librelogo_properties,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,librelogo_properties,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,librelogo_properties,$(LIBO_SHARE_FOLDER)/Scripts/python/LibreLogo,\
 	$(foreach lang,$(subst -,_,$(gb_TRANS_LANGS)),LibreLogo_$(lang).properties) \

more_fonts/ExternalPackage_dejavu.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	ttf/DejaVuSans-Bold.ttf \

more_fonts/ExternalPackage_gentium.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	GenBasB.ttf \

more_fonts/ExternalPackage_liberation.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	LiberationMono-Bold.ttf \

more_fonts/ExternalPackage_liberation_narrow.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	LiberationSansNarrow-Bold.ttf \

more_fonts/ExternalPackage_libertineg.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	LinBiolinum_RB_G.ttf \

more_fonts/ExternalPackage_opensans.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	OpenSans-BoldItalic.ttf \

more_fonts/ExternalPackage_ptserif.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	PT_Serif-Web-BoldItalic.ttf \

more_fonts/ExternalPackage_sourcecode.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	SourceCodePro-Bold.ttf \

more_fonts/ExternalPackage_sourcesans.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	SourceSansPro-BoldItalic.ttf \

more_fonts/Package_conf.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts))
 
-$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,more_fonts_conf,$(LIBO_SHARE_FOLDER)/fonts/truetype/fc_local.conf,fc_local.conf))
 

moz/ExternalPackage_runtime.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,moz_runtime,mozruntime))
 
-$(eval $(call gb_ExternalPackage_set_outdir,moz_runtime,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,moz_runtime,$(gb_INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,$(gb_Package_PROGRAMDIRNAME),\
 	components/addrbook.dll \

odk/GeneratedPackage_odk_doxygen.mk

@@ -11,7 +11,7 @@ $(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_doxygen,$(call gb_CustomT
 
 $(eval $(call gb_GeneratedPackage_use_customtarget,odk_doxygen,odk/docs))
 
-$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(gb_Package_SDKDIRNAME)/docs/cpp/ref,cpp/ref))
-$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(gb_Package_SDKDIRNAME)/docs/idl/ref,idl/ref))
+$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(gb_Package_SDKDIRNAME)/docs/cpp/ref,cpp/ref))
+$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(gb_Package_SDKDIRNAME)/docs/idl/ref,idl/ref))
 
 # vim: set noet sw=4 ts=4:

odk/GeneratedPackage_uno_loader_classes.mk

@@ -11,6 +11,6 @@ $(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_uno_loader_classes,$(call
 
 $(eval $(call gb_GeneratedPackage_use_customtarget,odk_uno_loader_classes,odk/classes))
 
-$(eval $(call gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader))
+$(eval $(call gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(INSTDIR)/$(gb_Package_SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader))
 
 # vim: set noet sw=4 ts=4:

officecfg/Package_misc.mk

@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg))
 
-$(eval $(call gb_Package_set_outdir,officecfg_misc,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,officecfg_misc,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,officecfg_misc,$(LIBO_SHARE_FOLDER)/registry/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample))
 $(eval $(call gb_Package_add_file,officecfg_misc,$(LIBO_SHARE_FOLDER)/registry/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample))

package/Package_dtd.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,package_dtd,$(SRCDIR)/package/dtd))
 
-$(eval $(call gb_Package_set_outdir,package_dtd,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,package_dtd,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,package_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0/Manifest.dtd,Manifest.dtd))
 

padmin/Package_padmin.mk

@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,padmin,$(SRCDIR)/padmin/source))
 
-$(eval $(call gb_Package_set_outdir,padmin,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,padmin,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_file,padmin,$(gb_PROGRAMDIRNAME)/spadmin,spadmin.sh))
 

postprocess/CustomTarget_images.mk

@@ -70,6 +70,6 @@ $(packimages_DIR)/sorted.lst : \
 		$(call gb_Postprocess_get_target,AllUIConfigs)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
-		$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(INSTDIR)/$(gb_UIConfig_INSTDIR) $@)
+		$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(gb_INSTROOT)/$(gb_UIConfig_INSTDIR) $@)
 
 # vim: set noet sw=4 ts=4:

postprocess/Package_images.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images)))
 
-$(eval $(call gb_Package_set_outdir,postprocess_images,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,postprocess_images,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,postprocess_images,$(LIBO_SHARE_FOLDER)/config,\
 	$(if $(filter default,$(WITH_THEMES)),images.zip) \

postprocess/Package_registry_install.mk

@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,postprocess_registry_install,$(call gb_CustomTarget_get_workdir,postprocess/registry)))
 
-$(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(gb_INSTROOT)))
 
 $(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry,\
 	$(postprocess_XCDS) \