[Libreoffice-commits] core.git: afms/ExternalPackage_fontunxafm.mk ct2n/ExternalPackage_ct2n.mk desktop/Package_branding_custom.mk desktop/Package_branding.mk desktop/Package_scripts_install.mk desktop/Package_soffice_bin.mk desktop/Package_soffice_sh.mk extensions/Package_mdibundle.mk extensions/Package_OOoSpotlightImporter.mk external/Package_mingw_dlls.mk external/Package_msvc_dlls.mk extras/ExternalPackage_accessoriesgallerydrawspeople.mk extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk extras/ExternalPackage_accessoriesgallery.mk extras/ExternalPackage_accessoriesgallerynonfree.mk extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk extras/ExternalPackage_accessoriesgalleryphotoscities.mk extras/ExternalPackage_accessoriesgalleryphotosfauna.mk extras/ExternalPackage_accessoriesgalleryphotosflowers.mk extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk extras/ExternalPackage_accessoriesgaller yphotoshumans.mk extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk extras/ExternalPackage_accessoriesgalleryphotosobjects.mk extras/ExternalPackage_accessoriesgalleryphotosplants.mk extras/ExternalPackage_accessoriesgalleryphotosspace.mk extras/ExternalPackage_accessoriesgalleryphotosstatues.mk extras/ExternalPackage_accessoriesgalleryphotostravel.mk extras/ExternalPackage_accessoriestemplatescommoneducate.mk extras/ExternalPackage_accessoriestemplatescommonfinance.mk extras/ExternalPackage_accessoriestemplatescommonforms.mk extras/ExternalPackage_accessoriestemplatescommonlabels.mk extras/ExternalPackage_accessoriestemplatescommonlayout.mk extras/ExternalPackage_accessoriestemplatescommonmisc.mk extras/ExternalPackage_accessoriestemplatescommon.mk extras/ExternalPackage_accessoriestemplatescommonofficorr.mk extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk extras/ExternalPackage_accessoriestemplatescommonpersonal.mk extras/ExternalPackage_accessorieste mplatescommonpresent.mk extras/ExternalPackage_extra_fonts.mk extras/Package_autocorr.mk extras/Package_autotextuser.mk extras/Package_cfgsrvbitmapunx.mk extras/Package_cfgsrvnolang.mk extras/Package_cfgusr.mk extras/Package_databasebiblio.mk extras/Package_database.mk extras/Package_fonts.mk extras/Package_gallbullets.mk extras/Package_gallhtmlexpo.mk extras/Package_gallmytheme.mk extras/Package_gallroot.mk extras/Package_gallsystem.mk extras/Package_gallwwwback.mk extras/Package_gallwwwgraf.mk extras/Package_glade.mk extras/Package_labels.mk extras/Package_newfiles.mk extras/Package_palettes.mk extras/Package_tpllayoutimpr.mk extras/Package_tplwizagenda.mk extras/Package_tplwizbitmap.mk extras/Package_tplwizdesktop.mk extras/Package_tplwizfax.mk extras/Package_tplwizletter.mk extras/Package_tplwizreport.mk extras/Package_tplwizstyles.mk filter/Package_docbook.mk filter/Package_xhtml.mk filter/Package_xslt.mk framework/Package_dtd.mk instsetoo_native/CustomTarget_setup.mk i nstsetoo_native/Package_setup.mk ios/CustomTarget_LibreOffice_app.mk jvmfwk/Package_jreproperties.mk jvmfwk/Package_rcfiles.mk libexttextcat/ExternalPackage_fingerprint.mk liblangtag/ExternalPackage_liblangtag_data.mk librelogo/Package_librelogo.mk librelogo/Package_librelogo_properties.mk more_fonts/ExternalPackage_dejavu.mk more_fonts/ExternalPackage_gentium.mk more_fonts/ExternalPackage_liberation.mk more_fonts/ExternalPackage_liberation_narrow.mk more_fonts/ExternalPackage_libertineg.mk more_fonts/ExternalPackage_opensans.mk more_fonts/ExternalPackage_ptserif.mk more_fonts/ExternalPackage_sourcecode.mk more_fonts/ExternalPackage_sourcesans.mk more_fonts/Package_conf.mk moz/ExternalPackage_runtime.mk odk/GeneratedPackage_odk_doxygen.mk odk/GeneratedPackage_uno_loader_classes.mk officecfg/Package_misc.mk package/Package_dtd.mk padmin/Package_padmin.mk postprocess/CustomTarget_images.mk postprocess/Package_images.mk postprocess/Package_registry_install.mk psprint_config/Pac kage_fontunxppds.mk psprint_config/Package_fontunxpsprint.mk python3/ExternalPackage_python3.mk python3/GeneratedPackage_python3.mk pyuno/Package_python_scripts.mk pyuno/Package_python_shell.mk reportbuilder/Package_reportbuilder-templates.mk RepositoryExternal.mk scripting/Package_java_jars.mk scripting/Package_java.mk scripting/Package_scriptbindinglib.mk scripting/Package_scriptproviderforpython.mk scripting/Package_ScriptsBeanShell.mk scripting/Package_ScriptsJavaScript.mk scripting/Package_ScriptsPython.mk sd/Package_opengl.mk sd/Package_web.mk sd/Package_xml.mk shell/Package_scripts_gnome.mk shell/Package_scripts_kde.mk shell/Package_scripts.mk shell/Package_senddoc.mk solenv/gbuild sysui/Package_osxicons.mk ure/Package_install.mk vcl/Package_osxres.mk wizards/Package_depot.mk wizards/Package_euro.mk wizards/Package_form.mk wizards/Package_gimmicks.mk wizards/Package_import.mk wizards/Package_share.mk wizards/Package_standard.mk wizards/Package_template.mk wizards/Pack age_tools.mk wizards/Package_tutorials.mk wizards/Package_usr.mk xmlhelp/Package_helpxsl.mk xmloff/Package_dtd.mk xmlscript/Package_dtd.mk
Stephan Bergmann
sbergman at redhat.com
Tue Sep 10 15:51:34 PDT 2013
RepositoryExternal.mk | 2 -
afms/ExternalPackage_fontunxafm.mk | 2 -
ct2n/ExternalPackage_ct2n.mk | 2 -
desktop/Package_branding.mk | 2 -
desktop/Package_branding_custom.mk | 2 -
desktop/Package_scripts_install.mk | 2 -
desktop/Package_soffice_bin.mk | 2 -
desktop/Package_soffice_sh.mk | 2 -
extensions/Package_OOoSpotlightImporter.mk | 2 -
extensions/Package_mdibundle.mk | 2 -
external/Package_mingw_dlls.mk | 2 -
external/Package_msvc_dlls.mk | 2 -
extras/ExternalPackage_accessoriesgallery.mk | 2 -
extras/ExternalPackage_accessoriesgallerydrawspeople.mk | 2 -
extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk | 2 -
extras/ExternalPackage_accessoriesgallerynonfree.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotoscities.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotosfauna.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotosflowers.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotoshumans.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotosobjects.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotosplants.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotosspace.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotosstatues.mk | 2 -
extras/ExternalPackage_accessoriesgalleryphotostravel.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommon.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommoneducate.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommonfinance.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommonforms.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommonlabels.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommonlayout.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommonmisc.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommonofficorr.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommonpersonal.mk | 2 -
extras/ExternalPackage_accessoriestemplatescommonpresent.mk | 2 -
extras/ExternalPackage_extra_fonts.mk | 2 -
extras/Package_autocorr.mk | 2 -
extras/Package_autotextuser.mk | 2 -
extras/Package_cfgsrvbitmapunx.mk | 2 -
extras/Package_cfgsrvnolang.mk | 2 -
extras/Package_cfgusr.mk | 2 -
extras/Package_database.mk | 2 -
extras/Package_databasebiblio.mk | 2 -
extras/Package_fonts.mk | 2 -
extras/Package_gallbullets.mk | 2 -
extras/Package_gallhtmlexpo.mk | 2 -
extras/Package_gallmytheme.mk | 2 -
extras/Package_gallroot.mk | 2 -
extras/Package_gallsystem.mk | 2 -
extras/Package_gallwwwback.mk | 2 -
extras/Package_gallwwwgraf.mk | 2 -
extras/Package_glade.mk | 2 -
extras/Package_labels.mk | 2 -
extras/Package_newfiles.mk | 2 -
extras/Package_palettes.mk | 2 -
extras/Package_tpllayoutimpr.mk | 2 -
extras/Package_tplwizagenda.mk | 2 -
extras/Package_tplwizbitmap.mk | 2 -
extras/Package_tplwizdesktop.mk | 2 -
extras/Package_tplwizfax.mk | 2 -
extras/Package_tplwizletter.mk | 2 -
extras/Package_tplwizreport.mk | 2 -
extras/Package_tplwizstyles.mk | 2 -
filter/Package_docbook.mk | 2 -
filter/Package_xhtml.mk | 2 -
filter/Package_xslt.mk | 2 -
framework/Package_dtd.mk | 2 -
instsetoo_native/CustomTarget_setup.mk | 6 ++--
instsetoo_native/Package_setup.mk | 2 -
ios/CustomTarget_LibreOffice_app.mk | 2 -
jvmfwk/Package_jreproperties.mk | 2 -
jvmfwk/Package_rcfiles.mk | 2 -
libexttextcat/ExternalPackage_fingerprint.mk | 2 -
liblangtag/ExternalPackage_liblangtag_data.mk | 2 -
librelogo/Package_librelogo.mk | 2 -
librelogo/Package_librelogo_properties.mk | 2 -
more_fonts/ExternalPackage_dejavu.mk | 2 -
more_fonts/ExternalPackage_gentium.mk | 2 -
more_fonts/ExternalPackage_liberation.mk | 2 -
more_fonts/ExternalPackage_liberation_narrow.mk | 2 -
more_fonts/ExternalPackage_libertineg.mk | 2 -
more_fonts/ExternalPackage_opensans.mk | 2 -
more_fonts/ExternalPackage_ptserif.mk | 2 -
more_fonts/ExternalPackage_sourcecode.mk | 2 -
more_fonts/ExternalPackage_sourcesans.mk | 2 -
more_fonts/Package_conf.mk | 2 -
moz/ExternalPackage_runtime.mk | 2 -
odk/GeneratedPackage_odk_doxygen.mk | 4 +-
odk/GeneratedPackage_uno_loader_classes.mk | 2 -
officecfg/Package_misc.mk | 2 -
package/Package_dtd.mk | 2 -
padmin/Package_padmin.mk | 2 -
postprocess/CustomTarget_images.mk | 2 -
postprocess/Package_images.mk | 2 -
postprocess/Package_registry_install.mk | 2 -
psprint_config/Package_fontunxppds.mk | 2 -
psprint_config/Package_fontunxpsprint.mk | 2 -
python3/ExternalPackage_python3.mk | 2 -
python3/GeneratedPackage_python3.mk | 2 -
pyuno/Package_python_scripts.mk | 2 -
pyuno/Package_python_shell.mk | 2 -
reportbuilder/Package_reportbuilder-templates.mk | 2 -
scripting/Package_ScriptsBeanShell.mk | 2 -
scripting/Package_ScriptsJavaScript.mk | 2 -
scripting/Package_ScriptsPython.mk | 2 -
scripting/Package_java.mk | 2 -
scripting/Package_java_jars.mk | 2 -
scripting/Package_scriptbindinglib.mk | 2 -
scripting/Package_scriptproviderforpython.mk | 2 -
sd/Package_opengl.mk | 2 -
sd/Package_web.mk | 2 -
sd/Package_xml.mk | 2 -
shell/Package_scripts.mk | 2 -
shell/Package_scripts_gnome.mk | 2 -
shell/Package_scripts_kde.mk | 2 -
shell/Package_senddoc.mk | 2 -
solenv/gbuild/AllLangPackage.mk | 4 +-
solenv/gbuild/AllLangResTarget.mk | 2 -
solenv/gbuild/Dictionary.mk | 4 +-
solenv/gbuild/Executable.mk | 2 -
solenv/gbuild/ExternalPackage.mk | 6 ++--
solenv/gbuild/Gallery.mk | 4 +-
solenv/gbuild/GeneratedPackage.mk | 14 +++++-----
solenv/gbuild/HelpTarget.mk | 2 -
solenv/gbuild/Jar.mk | 2 -
solenv/gbuild/Library.mk | 6 ++--
solenv/gbuild/Pagein.mk | 2 -
solenv/gbuild/Pyuno.mk | 2 -
solenv/gbuild/Rdb.mk | 4 +-
solenv/gbuild/UIConfig.mk | 6 ++--
solenv/gbuild/UnoApi.mk | 2 -
solenv/gbuild/platform/com_MSC_class.mk | 3 +-
solenv/gbuild/platform/macosx.mk | 3 +-
solenv/gbuild/platform/solaris.mk | 3 +-
solenv/gbuild/platform/unxgcc.mk | 3 +-
sysui/Package_osxicons.mk | 2 -
ure/Package_install.mk | 4 +-
vcl/Package_osxres.mk | 2 -
wizards/Package_depot.mk | 2 -
wizards/Package_euro.mk | 2 -
wizards/Package_form.mk | 2 -
wizards/Package_gimmicks.mk | 2 -
wizards/Package_import.mk | 2 -
wizards/Package_share.mk | 2 -
wizards/Package_standard.mk | 2 -
wizards/Package_template.mk | 2 -
wizards/Package_tools.mk | 2 -
wizards/Package_tutorials.mk | 2 -
wizards/Package_usr.mk | 2 -
xmlhelp/Package_helpxsl.mk | 2 -
xmloff/Package_dtd.mk | 2 -
xmlscript/Package_dtd.mk | 2 -
157 files changed, 181 insertions(+), 177 deletions(-)
New commits:
commit 5397b49f4dba9d065984a8b0eb356333c565217a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Sep 11 00:42:52 2013 +0200
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
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1cc32cf..8a8d06c 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 84e4c91..1ed76b2 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 68e3c92..ed77ba8 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 5d7dbf5..25fdbb6 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 5713d3f..eed7496 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 c64c2bd..2d36a59 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 9237426..acc9cab 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 757c681..f1a58fe 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 6cb662d..5423645 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 b8fc9a4..50ce85e 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 52eeed8..3b0f2b9 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 cbf09aa..47896f0 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 0180f70..5059651 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 6e61d5f..cb7e495 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 419e043..ebb03af 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 984fba3..4478ec4 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 cb6b720..f8859c9 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 4890c8e..2ff6d83 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 6b90457..3b51346 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 900a87b..0465ec4 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 dfd5feb..0125174 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 b7e5f02..55bda0e 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 6d5d26a..25e9864 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 de56f6d..b9ce827 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 4f23266..07b0682 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 e940d30..ca712fa 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 9d8ea9d..9756690 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 7883f39..9b57f74 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 b331d14..ac2323d 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 2e439ea..5b1c585 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 2f79d55..558d880 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 4499c78..ae287dd 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 3e9063e..99b23c3 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 9140267..7f60b32 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 c9914f0..4d40460 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 f32195d..b652823 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 8fc6f2b..6caaf03 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 8e4ee0f..185d309 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 3952f86..134df5f 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 eb2aca2..f21808c 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 0b48038..6ad5bf7 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 568762a..9ecd63c 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 0d3847a..56b7761 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 f95e5be..fcc34fb 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 9da56d4..0a711ee 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 87920e8..2381f5d 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 af794e5..cf89b5a 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 2517b8a..042af2d 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 6a30804..dfdd4d3 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 b1a6abd..0711b52 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 0f782fd..792004f 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 03bffeb..858692c 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 d2076cb..30981b6 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 bc027b0..cd901be 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 72e62f3..bcee303 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 2041f15..e26d045 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 f03cb42..192615f 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 ef64e5a..9d188d7 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 0f93a23..064face 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 a67681b..9cb6a9f 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 a6c0354..fd6cda2 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 f3b4bd3..654a5ee 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 9ea51d3..b6c4757 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 d3cd0ff..11776bb 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 a434d5f..2ed8936 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 5e71abd..6255963 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 f352643..93517d5 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 a637778..f5b0264 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 5c14376..12182e2 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 b2e3071..faaeca9 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 760edb8..2576f75 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 85b980d..dc5a754 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 930e66d..603fcd3 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 f75dc84..2cd15fc 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 9092ed9..bd4dacb 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
#
# "registry"
#
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
index 1b3302f..e70d57b 100644
--- a/jvmfwk/Package_jreproperties.mk
+++ b/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))
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk
index 22b9fbd..772ffd6 100644
--- a/jvmfwk/Package_rcfiles.mk
+++ b/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)
diff --git a/libexttextcat/ExternalPackage_fingerprint.mk b/libexttextcat/ExternalPackage_fingerprint.mk
index 0105ece..9e032fa 100644
--- a/libexttextcat/ExternalPackage_fingerprint.mk
+++ b/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 \
diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk b/liblangtag/ExternalPackage_liblangtag_data.mk
index 54790a1..4f8510c 100644
--- a/liblangtag/ExternalPackage_liblangtag_data.mk
+++ b/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 \
diff --git a/librelogo/Package_librelogo.mk b/librelogo/Package_librelogo.mk
index f80acae..16e219c 100644
--- a/librelogo/Package_librelogo.mk
+++ b/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 \
diff --git a/librelogo/Package_librelogo_properties.mk b/librelogo/Package_librelogo_properties.mk
index 581a880..05a3677 100644
--- a/librelogo/Package_librelogo_properties.mk
+++ b/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) \
diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk
index 71e42e8..447c72c 100644
--- a/more_fonts/ExternalPackage_dejavu.mk
+++ b/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 \
diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk
index 2293e74..4b0138a 100644
--- a/more_fonts/ExternalPackage_gentium.mk
+++ b/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 \
diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk
index 9fdd594..76fd346 100644
--- a/more_fonts/ExternalPackage_liberation.mk
+++ b/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 \
diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk
index 60c4cc4..e72fa4e 100644
--- a/more_fonts/ExternalPackage_liberation_narrow.mk
+++ b/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 \
diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk
index 17a08a0..279a87f 100644
--- a/more_fonts/ExternalPackage_libertineg.mk
+++ b/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 \
diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk
index 718e729..d0c4636 100644
--- a/more_fonts/ExternalPackage_opensans.mk
+++ b/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 \
diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk
index 6e6e7a4..2c868f5 100644
--- a/more_fonts/ExternalPackage_ptserif.mk
+++ b/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 \
diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/more_fonts/ExternalPackage_sourcecode.mk
index 5ddb08d..8cf75d6 100644
--- a/more_fonts/ExternalPackage_sourcecode.mk
+++ b/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 \
diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk
index 7ba1945..4d7f769 100644
--- a/more_fonts/ExternalPackage_sourcesans.mk
+++ b/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 \
diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk
index 627afc0..a81534c 100644
--- a/more_fonts/Package_conf.mk
+++ b/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))
diff --git a/moz/ExternalPackage_runtime.mk b/moz/ExternalPackage_runtime.mk
index 19366bf..639636b 100644
--- a/moz/ExternalPackage_runtime.mk
+++ b/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 \
diff --git a/odk/GeneratedPackage_odk_doxygen.mk b/odk/GeneratedPackage_odk_doxygen.mk
index b78d25d..48dfe04 100644
--- a/odk/GeneratedPackage_odk_doxygen.mk
+++ b/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:
diff --git a/odk/GeneratedPackage_uno_loader_classes.mk b/odk/GeneratedPackage_uno_loader_classes.mk
index 5c3998f..3af67c0 100644
--- a/odk/GeneratedPackage_uno_loader_classes.mk
+++ b/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:
diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk
index cc1e063..5640669 100644
--- a/officecfg/Package_misc.mk
+++ b/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))
diff --git a/package/Package_dtd.mk b/package/Package_dtd.mk
index baa5068..b8cced4 100644
--- a/package/Package_dtd.mk
+++ b/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))
diff --git a/padmin/Package_padmin.mk b/padmin/Package_padmin.mk
index 6787c2c..b4f5e85 100644
--- a/padmin/Package_padmin.mk
+++ b/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))
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 541941c..8e892a1 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/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:
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
index af98789..f550af3 100644
--- a/postprocess/Package_images.mk
+++ b/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) \
diff --git a/postprocess/Package_registry_install.mk b/postprocess/Package_registry_install.mk
index d21d2a2..5f8ed00 100644
--- a/postprocess/Package_registry_install.mk
+++ b/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) \
diff --git a/psprint_config/Package_fontunxppds.mk b/psprint_config/Package_fontunxppds.mk
index d06e052..33de345 100644
--- a/psprint_config/Package_fontunxppds.mk
+++ b/psprint_config/Package_fontunxppds.mk
@@ -18,7 +18,7 @@
$(eval $(call gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
-$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,psprint_config_fontunxppds,$(LIBO_SHARE_FOLDER)/psprint/driver,\
SGENPRT.PS \
diff --git a/psprint_config/Package_fontunxpsprint.mk b/psprint_config/Package_fontunxpsprint.mk
index f71092c..7a04ec7 100644
--- a/psprint_config/Package_fontunxpsprint.mk
+++ b/psprint_config/Package_fontunxpsprint.mk
@@ -18,7 +18,7 @@
$(eval $(call gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
-$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,psprint_config_fontunxpsprint,$(LIBO_SHARE_FOLDER)/psprint,\
psprint.conf \
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index 597062c..6c51309 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,python3,python3))
-$(eval $(call gb_ExternalPackage_set_outdir,python3,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,python3,$(gb_INSTROOT)))
$(eval $(call gb_ExternalPackage_use_external_project,python3,python3))
diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk
index d87bfba..8234071 100644
--- a/python3/GeneratedPackage_python3.mk
+++ b/python3/GeneratedPackage_python3.mk
@@ -13,6 +13,6 @@ $(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3))
$(eval $(call gb_GeneratedPackage_use_external_project,python3,python3))
-$(eval $(call gb_GeneratedPackage_add_dir,python3,$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(gb_Package_PROGRAMDIRNAME))/LibreOfficePython.framework,LibreOfficePython.framework))
+$(eval $(call gb_GeneratedPackage_add_dir,python3,$(gb_INSTROOT)/$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(gb_Package_PROGRAMDIRNAME))/LibreOfficePython.framework,LibreOfficePython.framework))
# vim: set noet sw=4 ts=4:
diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk
index 9afe7f5..c4fbfdd 100644
--- a/pyuno/Package_python_scripts.mk
+++ b/pyuno/Package_python_scripts.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,pyuno_python_scripts,$(SRCDIR)/pyuno/source))
-$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER),\
loader/pythonloader.py \
diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index 306e243..7492be1 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell)))
-$(eval $(call gb_Package_set_outdir,python_shell,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,python_shell,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_file,python_shell,$(gb_Package_PROGRAMDIRNAME)/python,python.sh))
diff --git a/reportbuilder/Package_reportbuilder-templates.mk b/reportbuilder/Package_reportbuilder-templates.mk
index 8592938..a637ce7 100644
--- a/reportbuilder/Package_reportbuilder-templates.mk
+++ b/reportbuilder/Package_reportbuilder-templates.mk
@@ -14,7 +14,7 @@
$(eval $(call gb_Package_Package,reportbuilder-templates,$(SRCDIR)/reportbuilder/template))
-$(eval $(call gb_Package_set_outdir,reportbuilder-templates,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,reportbuilder-templates,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files_with_dir,reportbuilder-templates,$(LIBO_SHARE_FOLDER)/template, \
common/wizard/report/default.otr \
diff --git a/scripting/Package_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk
index 44b6641..8a3daf3 100644
--- a/scripting/Package_ScriptsBeanShell.mk
+++ b/scripting/Package_ScriptsBeanShell.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,scripting_ScriptsBeanShell,$(SRCDIR)/scripting/examples))
-$(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsBeanShell,$(LIBO_SHARE_FOLDER)/Scripts,\
beanshell/Capitalise/capitalise.bsh \
diff --git a/scripting/Package_ScriptsJavaScript.mk b/scripting/Package_ScriptsJavaScript.mk
index 8780778..17519cf 100644
--- a/scripting/Package_ScriptsJavaScript.mk
+++ b/scripting/Package_ScriptsJavaScript.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,scripting_ScriptsJavaScript,$(SRCDIR)/scripting/examples))
-$(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsJavaScript,$(LIBO_SHARE_FOLDER)/Scripts,\
javascript/ExportSheetsToHTML/exportsheetstohtml.js \
diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk
index aa9985b..2f284b3 100644
--- a/scripting/Package_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/examples))
-$(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,$(LIBO_SHARE_FOLDER)/Scripts,\
python/Capitalise.py \
diff --git a/scripting/Package_java.mk b/scripting/Package_java.mk
index 7c846c0..79fb9be 100644
--- a/scripting/Package_java.mk
+++ b/scripting/Package_java.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,scripting_java,$(SRCDIR)/scripting/examples/java))
-$(eval $(call gb_Package_set_outdir,scripting_java,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,scripting_java,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files_with_dir,scripting_java,$(LIBO_SHARE_FOLDER)/Scripts/java,\
HelloWorld/HelloWorld.java \
diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk
index eaeee8b..9832a95 100644
--- a/scripting/Package_java_jars.mk
+++ b/scripting/Package_java_jars.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,scripting_java_jars,$(OUTDIR)/bin))
-$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/HelloWorld/HelloWorld.jar,HelloWorld.jar))
$(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/Highlight/Highlight.jar,Highlight.jar))
diff --git a/scripting/Package_scriptbindinglib.mk b/scripting/Package_scriptbindinglib.mk
index d630058..2ebdc10 100644
--- a/scripting/Package_scriptbindinglib.mk
+++ b/scripting/Package_scriptbindinglib.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,scripting_scriptbindinglib,$(SRCDIR)/scripting/workben/bindings))
-$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,scripting_scriptbindinglib,$(LIBO_SHARE_FOLDER)/basic/ScriptBindingLibrary,\
Highlight.xdl \
diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk
index cd2e8b6..d92dec4 100644
--- a/scripting/Package_scriptproviderforpython.mk
+++ b/scripting/Package_scriptproviderforpython.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov))
-$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
$(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py))
diff --git a/sd/Package_opengl.mk b/sd/Package_opengl.mk
index e51ac95..0e7d975 100644
--- a/sd/Package_opengl.mk
+++ b/sd/Package_opengl.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,sd_opengl,$(SRCDIR)/sd/xml))
-$(eval $(call gb_Package_set_outdir,sd_opengl,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,sd_opengl,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,sd_opengl,$(LIBO_SHARE_FOLDER)/config/soffice.cfg/simpress,\
transitions-ogl.xml \
diff --git a/sd/Package_web.mk b/sd/Package_web.mk
index 64c7838..3bb3937 100644
--- a/sd/Package_web.mk
+++ b/sd/Package_web.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,sd_web,$(SRCDIR)/sd/res))
-$(eval $(call gb_Package_set_outdir,sd_web,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,sd_web,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,sd_web,$(LIBO_SHARE_FOLDER)/config/webcast,\
webview/common.inc \
diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk
index ae635d4..e06aab6 100644
--- a/sd/Package_xml.mk
+++ b/sd/Package_xml.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml))
-$(eval $(call gb_Package_set_outdir,sd_xml,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,sd_xml,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,sd_xml,$(LIBO_SHARE_FOLDER)/config/soffice.cfg/simpress,\
effects.xml \
diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk
index d300337..b039682 100644
--- a/shell/Package_scripts.mk
+++ b/shell/Package_scripts.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc))
-$(eval $(call gb_Package_set_outdir,shell_scripts,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,shell_scripts,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_file,shell_scripts,$(gb_PROGRAMDIRNAME)/open-url,open-url.sh))
diff --git a/shell/Package_scripts_gnome.mk b/shell/Package_scripts_gnome.mk
index 194dbef1..0fb01b7 100644
--- a/shell/Package_scripts_gnome.mk
+++ b/shell/Package_scripts_gnome.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,shell_scripts_gnome,$(SRCDIR)/shell/source/unix/misc))
-$(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_file,shell_scripts_gnome,$(gb_PROGRAMDIRNAME)/gnome-open-url,gnome-open-url.sh))
diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
index 5214df2..a3c8b8b 100644
--- a/shell/Package_scripts_kde.mk
+++ b/shell/Package_scripts_kde.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
-$(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_file,shell_scripts_kde,$(gb_PROGRAMDIRNAME)/kde-open-url,kde-open-url.sh))
diff --git a/shell/Package_senddoc.mk b/shell/Package_senddoc.mk
index b2a7c28..cc6dcfc 100644
--- a/shell/Package_senddoc.mk
+++ b/shell/Package_senddoc.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,shell_senddoc,$(SRCDIR)/shell/source/unix/misc))
-$(eval $(call gb_Package_set_outdir,shell_senddoc,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,shell_senddoc,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_file,shell_senddoc,$(gb_PROGRAMDIRNAME)/senddoc,senddoc.sh))
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk
index 77e3e25..7039a2e 100644
--- a/solenv/gbuild/AllLangPackage.mk
+++ b/solenv/gbuild/AllLangPackage.mk
@@ -10,7 +10,7 @@
# AllLangPackage class
# Handles creation of a bunch of packages with content dependent on
-# language. The package files are placed into $(INSTDIR).
+# language. The package files are placed into $(gb_INSTROOT).
gb_AllLangPackage_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US)
@@ -44,7 +44,7 @@ endef
# gb_AllLangPackage__AllLangPackage_lang group package srcdir
define gb_AllLangPackage__AllLangPackage_onelang
$(call gb_Package_Package_internal,$(2),$(3))
-$(call gb_Package_set_outdir,$(2),$(INSTDIR))
+$(call gb_Package_set_outdir,$(2),$(gb_INSTROOT))
$(call gb_AllLangPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2))
$(call gb_AllLangPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index d9fdbca..6721a98 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -457,7 +457,7 @@ $(call gb_AllLangResTarget_get_target,%) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)
-gb_ResTarget_get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/resource/$(1).res
+gb_ResTarget_get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/resource/$(1).res
define gb_AllLangResTarget_AllLangResTarget
$(foreach lang,$(gb_AllLangResTarget_LANGS),\
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index eb7ba21..a1e4d61 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -213,8 +213,8 @@ $(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)),$(
$(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)_generated),$(WORKDIR))
$(call gb_PackageSet_PackageSet_internal,$(call gb_Dictionary_get_packagesetname,$(1)))
-$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)),$(INSTDIR))
-$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(INSTDIR))
+$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(gb_INSTROOT))
$(call gb_PackageSet_add_package,$(call gb_Dictionary_get_packagesetname,$(1)),$(call gb_Dictionary_get_packagename,$(1)))
ifeq (,$(gb_Dictionary_ALL_LANGS))
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 1640cec..645d05e 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -43,7 +43,7 @@ $(call gb_Executable_get_clean_target,%) :
$(call gb_Executable_get_runtime_target,$*) \
$(AUXTARGETS))
-gb_Executable__get_dir_for_layer = $(patsubst $(1):%,$(INSTDIR)/%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS)))
+gb_Executable__get_dir_for_layer = $(patsubst $(1):%,$(gb_INSTROOT)/%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS)))
gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1)))
gb_Executable_get_install_target = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1))
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 9d6a52c..9015af2 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -199,7 +199,7 @@ define gb_ExternalPackage__add_file_for_install
$(call gb_ExternalPackage_add_file,$(1),$(2),$(4))
$(call gb_Helper_install,$(call gb_ExternalPackage_get_target,$(1)), \
- $(INSTDIR)/$(3), \
+ $(gb_INSTROOT)/$(3), \
$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4))
$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4) :| \
@@ -211,7 +211,7 @@ endef
#
# This function is very similar to gb_ExternalPackage_add_file, except
# that it also allows to deliver the library to its proper place in
-# $(INSTDIR).
+# $(gb_INSTROOT).
#
# The last argument is the name under which the library was registered.
# It is used to determine layer, if the library is not in layer OOO.
@@ -234,7 +234,7 @@ endef
#
# This function works just like to gb_ExternalPackage_add_file, except
# that it also allows to deliver the jar to its proper place in
-# $(INSTDIR).
+# $(gb_INSTROOT).
#
# gb_ExternalPackage_add_jar_for_install package dest src
define gb_ExternalPackage_add_jar_for_install
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 45f2602..f70aba0 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -140,7 +140,7 @@ $(call gb_Gallery__Gallery_impl,$(1),$(call gb_Gallery_get_packagename,$(1)),$(2
# setup the files package - we install all of these too
$(call gb_Package_Package_internal,$(call gb_Gallery_get_files_packagename,$(1)),$(SRCDIR)/$(2))
-$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(INSTDIR))
+$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(gb_INSTROOT))
$(call gb_Gallery__get_final_target,$(1)) : $(call gb_Package_get_target,$(call gb_Gallery_get_files_packagename,$(1)))
$(call gb_Gallery_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Gallery_get_files_packagename,$(1)))
@@ -155,7 +155,7 @@ gb_Gallery_basedir = $(patsubst %/,%,$(dir $(SRCDIR)/$(1)))
# gb_Gallery__Gallery_impl gallery package basedir name
define gb_Gallery__Gallery_impl
$(call gb_Package_Package_internal,$(2),$(call gb_Gallery_get_workdir,$(1)))
-$(call gb_Package_set_outdir,$(2),$(INSTDIR))
+$(call gb_Package_set_outdir,$(2),$(gb_INSTROOT))
$(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdg,$(1).sdg)
$(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).sdv,$(1).sdv)
$(call gb_Package_add_file,$(2),$(gb_Gallery_INSTDIR)/$(1).thm,$(1).thm)
diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk
index e0c5036..704a508 100644
--- a/solenv/gbuild/GeneratedPackage.mk
+++ b/solenv/gbuild/GeneratedPackage.mk
@@ -9,7 +9,7 @@
# class GeneratedPackage
-# Enables to deliver whole directories (of generated files) to $(INSTDIR).
+# Enables to deliver whole directories (of generated files) to instdir.
#
# GeneratedPackage shall be used as a substitution for Package when the
# names of the produced files are not known in advance (in older times,
@@ -23,18 +23,18 @@ gb_GeneratedPackage__get_srcdir = $(lastword $(subst :, ,$(1)))
gb_GeneratedPackage__get_destdir = $(firstword $(subst :, ,$(1)))
define gb_GeneratedPackage__command_cp
-mkdir -p $(dir $(INSTDIR)/$(2)) && \
-cp -R $(PACKAGE_SOURCEDIR)/$(1) $(INSTDIR)/$(2)
+mkdir -p $(dir $(2)) && \
+cp -R $(PACKAGE_SOURCEDIR)/$(1) $(2)
endef
define gb_GeneratedPackage__command
$(call gb_Output_announce,$(2),$(true),GPK,2)
$(call gb_Helper_abbreviate_dirs,\
- rm -rf $(addprefix $(INSTDIR)/,$(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair)))) && \
+ rm -rf $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) && \
$(foreach pair,$(PACKAGE_DIRS),\
$(call gb_GeneratedPackage__command_cp,$(call gb_GeneratedPackage__get_srcdir,$(pair)),$(call gb_GeneratedPackage__get_destdir,$(pair))) &&) \
find \
- $(addprefix $(INSTDIR)/,$(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair)))) \
+ $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \
\( -type f -o -type l \) -print \
> $(1) \
)
@@ -63,7 +63,7 @@ $(call gb_GeneratedPackage_get_target,%) :
.PHONY : $(call gb_GeneratedPackage_get_clean_target,%)
$(call gb_GeneratedPackage_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),GPK,2)
- rm -rf $(call gb_GeneratedPackage_get_target,$*) $(addprefix $(INSTDIR)/,$(PACKAGE_DIRS))
+ rm -rf $(call gb_GeneratedPackage_get_target,$*) $(PACKAGE_DIRS)
# Create a generated package.
#
@@ -107,7 +107,7 @@ endef
# Add a dir to the package.
#
-# The srcdir will be copied to $(INSTDIR) as destdir.
+# The srcdir will be copied to instdir as destdir.
#
# gb_GeneratedPackage_add_dir package destdir srcdir
define gb_GeneratedPackage_add_dir
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 29a15b6..06002c4 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -594,7 +594,7 @@ $(call gb_HelpLinkTarget_HelpLinkTarget,$(1),$(2),$(3),$(4))
$(call gb_HelpIndexTarget_HelpIndexTarget,$(1),$(2),$(3),$(4))
$(call gb_HelpJarTarget_HelpJarTarget,$(1),$(2),$(4))
$(call gb_Package_Package_internal,$(5),$(4))
-$(call gb_Package_set_outdir,$(5),$(INSTDIR))
+$(call gb_Package_set_outdir,$(5),$(gb_INSTROOT))
$(call gb_HelpTarget_get_linked_target,$(1)) : $(call gb_HelpTarget_get_translation_target,$(1))
$(call gb_HelpLinkTarget_get_target,$(1)) : $(call gb_HelpTarget_get_linked_target,$(1))
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index d904301..155fa92 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -37,7 +37,7 @@ $(call gb_Jar_get_workdir,$(1))/META-INF/MANIFEST.MF
endef
gb_Jar__get_layer = $(strip $(foreach group,$(gb_Jar_VALIDGROUPS),$(if $(filter $(1),$(gb_Jar_$(group))),$(group))))
-gb_Jar__get_dir_for_layer = $(patsubst $(1):%,$(INSTDIR)/%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS)))
+gb_Jar__get_dir_for_layer = $(patsubst $(1):%,$(gb_INSTROOT)/%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS)))
gb_Jar_get_install_target = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_layer,$(1)))/$(1).jar
# creates classset and META-INF folders if they don't exist
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index d3488d2..b88cf50 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -45,7 +45,7 @@ $(WORKDIR)/Clean/OutDir/lib/%$(gb_Library_PLAINEXT) :
gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER_DIRS)))
gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1)))
-gb_Library_get_install_target = $(INSTDIR)/$(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1))
+gb_Library_get_install_target = $(gb_INSTROOT)/$(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1))
define gb_Library_Library
$(call gb_Postprocess_register_target,AllLibraries,Library,$(1))
@@ -67,9 +67,9 @@ endef
define gb_Library__Library_impl_copy
$(call gb_Package_Package,Library_Copy_$(1),$(gb_Package_PRESTAGEDIR))
-$(call gb_Package_set_outdir,Library_Copy_$(1),$(INSTDIR))
+$(call gb_Package_set_outdir,Library_Copy_$(1),$(gb_INSTROOT))
$(call gb_Package_add_file,Library_Copy_$(1),$(2),$(2))
-$(OUTDIR)/lib/$(notdir $(2)) : $(INSTDIR)/$(2)
+$(OUTDIR)/lib/$(notdir $(2)) : $(gb_INSTROOT)/$(2)
endef
define gb_Library__Library_impl
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 2d94f55..0392ccb 100644
--- a/solenv/gbuild/Pagein.mk
+++ b/solenv/gbuild/Pagein.mk
@@ -18,7 +18,7 @@ gb_Pagein__make_library_path = $(call gb_Pagein__get_libdir,$(1))$(call gb_Libra
gb_Pagein__make_path = \
$(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)),$(1))
-gb_Pagein__get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
+gb_Pagein__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
gb_Pagein__get_final_target = $(WORKDIR)/Pagein/pagein-$(1).final
define gb_Pagein__command
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 36385d2..a428bb3 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -33,7 +33,7 @@ gb_Pyuno_get_packagename = Pyuno/$(1)
# gb_Pyuno_Pyuno component
define gb_Pyuno_Pyuno
$(call gb_Package_Package_internal,$(call gb_Pyuno_get_packagename,$(1)),$(2))
-$(call gb_Package_set_outdir,$(call gb_Pyuno_get_packagename,$(1)),$(INSTDIR))
+$(call gb_Package_set_outdir,$(call gb_Pyuno_get_packagename,$(1)),$(gb_INSTROOT))
$(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_Pyuno_get_packagename,$(1)))
$(call gb_Pyuno_get_target,$(1)) :| $(dir $(call gb_Pyuno_get_target,$(1))).dir
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index afb6681..980f2c8 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-gb_Rdb__get_install_target = $(INSTDIR)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb
+gb_Rdb__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb
gb_Rdb__get_final_target = $(WORKDIR)/Rdb/$(1).final
define gb_Rdb__command
@@ -45,7 +45,7 @@ endef
define gb_Rdb_install
$(call gb_Helper_install,$(call gb_Rdb__get_final_target,$(1)), \
- $(if $(2),$(INSTDIR)/$(2),$(call gb_Rdb__get_install_target,$(1))), \
+ $(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))), \
$(call gb_Rdb_get_target,$(1)))
endef
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 2033e06..50fbfb3 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -209,8 +209,8 @@ $(call gb_PackageSet_PackageSet_internal,$(call gb_UIConfig_get_packagesetname,$
$(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)),$(SRCDIR))
$(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)_generated),$(WORKDIR))
-$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)),$(INSTDIR))
-$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)_generated),$(INSTDIR))
+$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)_generated),$(gb_INSTROOT))
$(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1)))
$(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir
@@ -230,7 +230,7 @@ endef
define gb_UIConfig__UIConfig_for_lang
$(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR))
-$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(INSTDIR))
+$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_INSTROOT))
$(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)))
$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)))
diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk
index 3739530..4ebeb85 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -40,7 +40,7 @@ endef
define gb_UnoApi_install
$(if $(2),,$(call gb_Output_error,gb_UnoApi_install: missing install name.))
$(call gb_Helper_install,$(call gb_UnoApi_get_target,$(1)), \
- $(INSTDIR)/$(2), \
+ $(gb_INSTROOT)/$(2), \
$(call gb_UnoApiTarget_get_target,$(1)))
endef
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 18dcc57..1cc1aea 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -17,7 +17,8 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_DEVINSTALLROOT := $(INSTDIR)
+gb_INSTROOT := $(INSTDIR)
+gb_DEVINSTALLROOT := $(gb_INSTROOT)
# Convert path to file URL.
define gb_Helper_make_url
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 0c18baa..c8f8fce 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -17,7 +17,8 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_DEVINSTALLROOT := $(INSTDIR)/LibreOffice.app/Contents
+gb_INSTROOT := $(INSTDIR)/LibreOffice.app/Contents
+gb_DEVINSTALLROOT := $(gb_INSTROOT)
gb_SDKDIR := $(MACOSX_SDK_PATH)
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 89a4cdc..78e401c 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -17,7 +17,8 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_DEVINSTALLROOT := $(INSTDIR)
+gb_INSTROOT := $(INSTDIR)
+gb_DEVINSTALLROOT := $(gb_INSTROOT)
include $(GBUILDDIR)/platform/com_GCC_defs.mk
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 0bdeff6..1102a27 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -17,7 +17,8 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_DEVINSTALLROOT := $(INSTDIR)
+gb_INSTROOT := $(INSTDIR)
+gb_DEVINSTALLROOT := $(gb_INSTROOT)
include $(GBUILDDIR)/platform/com_GCC_defs.mk
diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk
index 6f8ca5f..2f587d5 100644
--- a/sysui/Package_osxicons.mk
+++ b/sysui/Package_osxicons.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop/icons))
-$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\
text.icns \
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 62fce64..be5976a 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
-$(eval $(call gb_Package_set_outdir,ure_install,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,ure_install,$(gb_INSTROOT)))
ifneq (WNT,$(OS))
ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),)
@@ -20,7 +20,7 @@ endif
ifeq (MACOSX,$(OS))
ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),)
-$(eval $(call gb_Package_add_symbolic_link,ure_install,Contents/MacOS/urelibs,../ure-link/lib))
+$(eval $(call gb_Package_add_symbolic_link,ure_install,MacOS/urelibs,../ure-link/lib))
endif
else ifeq (WNT,$(OS))
$(eval $(call gb_Package_add_file,ure_install,ure-link,ure-link))
diff --git a/vcl/Package_osxres.mk b/vcl/Package_osxres.mk
index 8f4849f..9947efa 100644
--- a/vcl/Package_osxres.mk
+++ b/vcl/Package_osxres.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,vcl_osxres,$(SRCDIR)/vcl/aqua/source/res))
-$(eval $(call gb_Package_set_outdir,vcl_osxres,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,vcl_osxres,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files_with_dir,vcl_osxres,Resources,\
MainMenu.nib/classes.nib \
diff --git a/wizards/Package_depot.mk b/wizards/Package_depot.mk
index 7ee4728..6080e63 100644
--- a/wizards/Package_depot.mk
+++ b/wizards/Package_depot.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicsrvdepot,$(SRCDIR)/wizards/source/depot))
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicsrvdepot,$(LIBO_SHARE_FOLDER)/basic/Depot,\
CommonLang.xba \
diff --git a/wizards/Package_euro.mk b/wizards/Package_euro.mk
index 892c482..0f80d8e 100644
--- a/wizards/Package_euro.mk
+++ b/wizards/Package_euro.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicsrveuro,$(SRCDIR)/wizards/source/euro))
-$(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicsrveuro,$(LIBO_SHARE_FOLDER)/basic/Euro,\
AutoPilotRun.xba \
diff --git a/wizards/Package_form.mk b/wizards/Package_form.mk
index e7bbea3..54c47a0 100644
--- a/wizards/Package_form.mk
+++ b/wizards/Package_form.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicsrvform,$(SRCDIR)/wizards/source/formwizard))
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicsrvform,$(LIBO_SHARE_FOLDER)/basic/FormWizard,\
DBMeta.xba \
diff --git a/wizards/Package_gimmicks.mk b/wizards/Package_gimmicks.mk
index 130d1b7..1844845 100644
--- a/wizards/Package_gimmicks.mk
+++ b/wizards/Package_gimmicks.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicsrvgimmicks,$(SRCDIR)/wizards/source/gimmicks))
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicsrvgimmicks,$(LIBO_SHARE_FOLDER)/basic/Gimmicks,\
AutoText.xba \
diff --git a/wizards/Package_import.mk b/wizards/Package_import.mk
index 5bffcb5..f2d187e 100644
--- a/wizards/Package_import.mk
+++ b/wizards/Package_import.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicsrvimport,$(SRCDIR)/wizards/source/importwizard))
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicsrvimport,$(LIBO_SHARE_FOLDER)/basic/ImportWizard,\
API.xba \
diff --git a/wizards/Package_share.mk b/wizards/Package_share.mk
index e78df3d..ed9a863 100644
--- a/wizards/Package_share.mk
+++ b/wizards/Package_share.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicshare,$(SRCDIR)/wizards/source/configshare))
-$(eval $(call gb_Package_set_outdir,wizards_basicshare,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,wizards_basicshare,$(gb_INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicshare,$(LIBO_SHARE_FOLDER)/basic,\
dialog.xlc \
diff --git a/wizards/Package_standard.mk b/wizards/Package_standard.mk
index 91e6b7f..294ca32 100644
--- a/wizards/Package_standard.mk
+++ b/wizards/Package_standard.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicsrvstandard,$(SRCDIR)/wizards/source/standard))
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(INSTDIR)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(gb_INSTROOT)))
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list