summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RepositoryExternal.mk10
-rw-r--r--afms/ExternalPackage_fontunxafm.mk2
-rw-r--r--bridges/Package_jnilib_java_uno.mk2
-rw-r--r--config_host.mk.in8
-rw-r--r--configure.ac39
-rw-r--r--ct2n/ExternalPackage_ct2n.mk2
-rw-r--r--desktop/Package_branding.mk2
-rw-r--r--desktop/Package_branding_custom.mk2
-rw-r--r--desktop/Package_desktop_install.mk2
-rw-r--r--desktop/Package_scripts_install.mk2
-rw-r--r--desktop/Package_soffice_sh.mk2
-rw-r--r--extensions/Package_OOoSpotlightImporter.mk2
-rw-r--r--extensions/Package_mdibundle.mk2
-rw-r--r--external/Package_mingw_dlls.mk2
-rw-r--r--external/Package_msvc_dlls.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgallery.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgallerydrawspeople.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgallerynonfree.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotoscities.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotosfauna.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotosflowers.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotoshumans.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotosobjects.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotosplants.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotosspace.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotosstatues.mk2
-rw-r--r--extras/ExternalPackage_accessoriesgalleryphotostravel.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommon.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommoneducate.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommonfinance.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommonforms.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommonlabels.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommonlayout.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommonmisc.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommonofficorr.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommonpersonal.mk2
-rw-r--r--extras/ExternalPackage_accessoriestemplatescommonpresent.mk2
-rw-r--r--extras/ExternalPackage_extra_fonts.mk2
-rw-r--r--extras/Package_autocorr.mk2
-rw-r--r--extras/Package_autotextuser.mk2
-rw-r--r--extras/Package_cfgsrvbitmapunx.mk2
-rw-r--r--extras/Package_cfgsrvnolang.mk2
-rw-r--r--extras/Package_cfgusr.mk2
-rw-r--r--extras/Package_database.mk2
-rw-r--r--extras/Package_databasebiblio.mk2
-rw-r--r--extras/Package_fonts.mk2
-rw-r--r--extras/Package_gallbullets.mk2
-rw-r--r--extras/Package_gallhtmlexpo.mk2
-rw-r--r--extras/Package_gallmytheme.mk2
-rw-r--r--extras/Package_gallroot.mk2
-rw-r--r--extras/Package_gallsystem.mk2
-rw-r--r--extras/Package_gallwwwback.mk2
-rw-r--r--extras/Package_gallwwwgraf.mk2
-rw-r--r--extras/Package_glade.mk2
-rw-r--r--extras/Package_labels.mk2
-rw-r--r--extras/Package_newfiles.mk2
-rw-r--r--extras/Package_palettes.mk2
-rw-r--r--extras/Package_tpllayoutimpr.mk2
-rw-r--r--extras/Package_tplwizagenda.mk2
-rw-r--r--extras/Package_tplwizbitmap.mk2
-rw-r--r--extras/Package_tplwizdesktop.mk2
-rw-r--r--extras/Package_tplwizfax.mk2
-rw-r--r--extras/Package_tplwizletter.mk2
-rw-r--r--extras/Package_tplwizreport.mk2
-rw-r--r--extras/Package_tplwizstyles.mk2
-rw-r--r--filter/Package_docbook.mk2
-rw-r--r--filter/Package_xhtml.mk2
-rw-r--r--filter/Package_xslt.mk2
-rw-r--r--framework/Package_dtd.mk2
-rw-r--r--i18npool/CustomTarget_localedata.mk2
-rw-r--r--instsetoo_native/Package_setup.mk2
-rw-r--r--ios/CustomTarget_LibreOffice_app.mk2
-rw-r--r--jvmfwk/Package_jreproperties.mk2
-rw-r--r--jvmfwk/Package_rcfiles.mk2
-rw-r--r--libexttextcat/ExternalPackage_fingerprint.mk2
-rw-r--r--liblangtag/ExternalPackage_liblangtag_data.mk2
-rw-r--r--librelogo/Package_librelogo.mk2
-rw-r--r--librelogo/Package_librelogo_properties.mk2
-rw-r--r--more_fonts/ExternalPackage_dejavu.mk2
-rw-r--r--more_fonts/ExternalPackage_gentium.mk2
-rw-r--r--more_fonts/ExternalPackage_liberation.mk2
-rw-r--r--more_fonts/ExternalPackage_liberation_narrow.mk2
-rw-r--r--more_fonts/ExternalPackage_libertineg.mk2
-rw-r--r--more_fonts/ExternalPackage_opensans.mk2
-rw-r--r--more_fonts/ExternalPackage_ptserif.mk2
-rw-r--r--more_fonts/ExternalPackage_sourcecode.mk2
-rw-r--r--more_fonts/ExternalPackage_sourcesans.mk2
-rw-r--r--more_fonts/Package_conf.mk2
-rw-r--r--moz/ExternalPackage_runtime.mk2
-rw-r--r--officecfg/Package_misc.mk2
-rw-r--r--package/Package_dtd.mk2
-rw-r--r--padmin/Package_padmin.mk2
-rw-r--r--postprocess/CustomTarget_images.mk2
-rw-r--r--postprocess/Package_images.mk2
-rw-r--r--postprocess/Package_registry_install.mk2
-rw-r--r--psprint_config/Package_fontunxppds.mk2
-rw-r--r--psprint_config/Package_fontunxpsprint.mk2
-rw-r--r--python3/ExternalPackage_python3.mk2
-rw-r--r--python3/GeneratedPackage_python3.mk2
-rw-r--r--pyuno/Package_python_scripts.mk2
-rw-r--r--pyuno/Package_python_shell.mk2
-rw-r--r--reportbuilder/Package_reportbuilder-templates.mk2
-rw-r--r--scripting/Package_ScriptsBeanShell.mk2
-rw-r--r--scripting/Package_ScriptsJavaScript.mk2
-rw-r--r--scripting/Package_ScriptsPython.mk2
-rw-r--r--scripting/Package_java.mk2
-rw-r--r--scripting/Package_java_jars.mk2
-rw-r--r--scripting/Package_scriptbindinglib.mk2
-rw-r--r--scripting/Package_scriptproviderforpython.mk2
-rw-r--r--sd/Package_opengl.mk2
-rw-r--r--sd/Package_web.mk2
-rw-r--r--sd/Package_xml.mk2
-rw-r--r--shell/Package_scripts.mk2
-rw-r--r--shell/Package_scripts_gnome.mk2
-rw-r--r--shell/Package_scripts_kde.mk2
-rw-r--r--shell/Package_senddoc.mk2
-rw-r--r--smoketest/CppunitTest_smoketest.mk2
-rw-r--r--smoketest/Executable_libtest.mk4
-rw-r--r--solenv/gbuild/AllLangPackage.mk4
-rw-r--r--solenv/gbuild/AllLangResTarget.mk2
-rw-r--r--solenv/gbuild/CppunitTest.mk4
-rw-r--r--solenv/gbuild/Dictionary.mk4
-rw-r--r--solenv/gbuild/Executable.mk13
-rw-r--r--solenv/gbuild/ExternalPackage.mk8
-rw-r--r--solenv/gbuild/Gallery.mk8
-rw-r--r--solenv/gbuild/HelpTarget.mk2
-rw-r--r--solenv/gbuild/Jar.mk2
-rw-r--r--solenv/gbuild/JunitTest.mk2
-rw-r--r--solenv/gbuild/Library.mk10
-rw-r--r--solenv/gbuild/Pagein.mk2
-rw-r--r--solenv/gbuild/PythonTest.mk4
-rw-r--r--solenv/gbuild/Pyuno.mk2
-rw-r--r--solenv/gbuild/Rdb.mk6
-rw-r--r--solenv/gbuild/TargetLocations.mk6
-rw-r--r--solenv/gbuild/UIConfig.mk6
-rw-r--r--solenv/gbuild/UnoApi.mk2
-rw-r--r--solenv/gbuild/platform/IOS_ARM_GCC.mk3
-rw-r--r--solenv/gbuild/platform/com_GCC_defs.mk2
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk9
-rw-r--r--solenv/gbuild/platform/macosx.mk13
-rw-r--r--solenv/gbuild/platform/mingw.mk3
-rw-r--r--solenv/gbuild/platform/solaris.mk13
-rw-r--r--solenv/gbuild/platform/unxgcc.mk15
-rw-r--r--sysui/Package_infoplist.mk2
-rw-r--r--sysui/Package_osxicons.mk2
-rw-r--r--ure/Package_install.mk2
-rw-r--r--vcl/Package_osxres.mk2
-rw-r--r--wizards/Package_depot.mk2
-rw-r--r--wizards/Package_euro.mk2
-rw-r--r--wizards/Package_form.mk2
-rw-r--r--wizards/Package_gimmicks.mk2
-rw-r--r--wizards/Package_import.mk2
-rw-r--r--wizards/Package_share.mk2
-rw-r--r--wizards/Package_standard.mk2
-rw-r--r--wizards/Package_template.mk2
-rw-r--r--wizards/Package_tools.mk2
-rw-r--r--wizards/Package_tutorials.mk2
-rw-r--r--wizards/Package_usr.mk2
-rw-r--r--xmlhelp/Package_helpxsl.mk2
-rw-r--r--xmloff/Package_dtd.mk2
-rw-r--r--xmlscript/Package_dtd.mk2
167 files changed, 249 insertions, 233 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4db3dd15827e..b036b667b0b7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2911,7 +2911,7 @@ $(call gb_Executable_add_runtime_dependencies,climaker,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_target_for_build,ure/services) \
- $(gb_INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
+ $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
$(call gb_UnoApi_get_target,udkapi) \
)
endef
@@ -2944,7 +2944,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
)) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_target_for_build,ure/services) \
- $(gb_INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
+ $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
$(call gb_UnoApi_get_target,offapi) \
$(call gb_UnoApi_get_target,udkapi) \
)
@@ -2986,7 +2986,7 @@ $(call gb_Executable_add_runtime_dependencies,saxparser,\
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_target_for_build,saxparser) \
$(call gb_Rdb_get_target_for_build,ure/services) \
- $(gb_INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
+ $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
$(call gb_UnoApi_get_target,udkapi) \
)
endef
@@ -3000,7 +3000,7 @@ $(call gb_Executable_add_runtime_dependencies,uno,\
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_target_for_build,ure/services) \
- $(gb_INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
+ $(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
$(call gb_UnoApi_get_target,udkapi) \
)
endef
@@ -3050,7 +3050,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_
else
-$(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_internal,python,$(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 1ed76b212448..936b1af6e709 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,afms_fontunxafm,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,$(LIBO_SHARE_FOLDER)/psprint/fontmetric,\
Courier-Bold.afm \
diff --git a/bridges/Package_jnilib_java_uno.mk b/bridges/Package_jnilib_java_uno.mk
index 7dfe7744e8c6..918acd9cf97c 100644
--- a/bridges/Package_jnilib_java_uno.mk
+++ b/bridges/Package_jnilib_java_uno.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,bridges_jnilib_java_uno,$(SRCDIR)))
-$(eval $(call gb_Package_set_outdir,bridges_jnilib_java_uno,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,bridges_jnilib_java_uno,$(INSTROOT)))
$(eval $(call gb_Package_add_symbolic_link,bridges_jnilib_java_uno,$(LIBO_URE_LIB_FOLDER)/$(basename $(notdir $(call gb_Library_get_target,java_uno))).jnilib,$(notdir $(call gb_Library_get_target,java_uno))))
diff --git a/config_host.mk.in b/config_host.mk.in
index b7e3e0930b3f..567c8b1e1c31 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -260,10 +260,13 @@ export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@
export ILIB=@ILIB@
export INPATH=@INPATH@
export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@
-export INSTDIR=@INSTDIR@
export INSTALLDIR=@INSTALLDIR@
export INSTALLDIRNAME=@INSTALLDIRNAME@
export INSTALL_NAME_TOOL=@INSTALL_NAME_TOOL@
+export INSTDIR=@INSTDIR@
+export INSTDIR_FOR_BUILD=@INSTDIR_FOR_BUILD@
+export INSTROOT=@INSTROOT@
+export INSTROOT_FOR_BUILD=@INSTROOT_FOR_BUILD@
export JAVACISGCJ=@JAVACISGCJ@
export JAVACOMPILER=@JAVACOMPILER@
export JAVADOC=@JAVADOC@
@@ -307,8 +310,10 @@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
export LIBLOADER_JAR=@LIBLOADER_JAR@
export LIBO_BIN_FOLDER=@LIBO_BIN_FOLDER@
+export LIBO_BIN_FOLDER_FOR_BUILD=@LIBO_BIN_FOLDER_FOR_BUILD@
export LIBO_ETC_FOLDER=@LIBO_ETC_FOLDER@
export LIBO_LIB_FOLDER=@LIBO_LIB_FOLDER@
+export LIBO_LIB_FOLDER_FOR_BUILD=@LIBO_LIB_FOLDER_FOR_BUILD@
export LIBO_LIB_PYUNO_FOLDER=@LIBO_LIB_PYUNO_FOLDER@
export LIBO_SHARE_FOLDER=@LIBO_SHARE_FOLDER@
export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@
@@ -317,6 +322,7 @@ export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@
export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@
export LIBO_URE_BIN_FOLDER=@LIBO_URE_BIN_FOLDER@
export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@
+export LIBO_URE_LIB_FOLDER_FOR_BUILD=@LIBO_URE_LIB_FOLDER_FOR_BUILD@
export LIBO_URE_SHARE_FOLDER=@LIBO_URE_SHARE_FOLDER@
export LIBO_URE_SHARE_JAVA_FOLDER=@LIBO_URE_SHARE_JAVA_FOLDER@
export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
diff --git a/configure.ac b/configure.ac
index 3ceb861b4855..c9aa11267bc5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,15 @@ dnl do this before argument processing to allow for platform dependent defaults
dnl ===================================================================
AC_CANONICAL_HOST
+AC_MSG_CHECKING([for product name])
+if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
+ PRODUCTNAME=AC_PACKAGE_NAME"Dev"
+else
+ PRODUCTNAME=AC_PACKAGE_NAME
+fi
+AC_MSG_RESULT([$PRODUCTNAME])
+AC_SUBST(PRODUCTNAME)
+
AC_PROG_EGREP
# AC_PROG_EGREP doesn't set GREP on all systems as well
AC_PATH_PROG(GREP, grep)
@@ -371,6 +380,8 @@ LINKFLAGSNOUNDEFS="-Wl,-z,defs"
CPP_LIBRARY="GLIBCXX"
AC_SUBST(CPP_LIBRARY)
+INSTROOTSUFFIX=
+
case "$host_os" in
solaris*)
@@ -481,6 +492,7 @@ darwin*) # Mac OS X or iOS
test_cups=no
else
_os=Darwin
+ INSTROOTSUFFIX=/$(PRODUCTNAME).app/Contents
fi
enable_systray=no
# See comment above the case "$host_os"
@@ -4298,6 +4310,7 @@ else
WORKDIR=${BUILDDIR}/workdir/${INPATH}
INSTDIR=${BUILDDIR}/instdir/${INPATH}
fi
+INSTROOT="${INSTDIR}${INSTROOTSUFFIX}"
OUTDIR="${SOLARVER}/${INPATH}"
SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC"
AC_SUBST(COM)
@@ -4309,6 +4322,7 @@ AC_SUBST(EPM_FLAGS)
AC_SUBST(GUIBASE)
AC_SUBST(INPATH)
AC_SUBST([INSTDIR])
+AC_SUBST([INSTROOT])
AC_SUBST(OS)
AC_SUBST(OUTDIR)
AC_SUBST(OUTPATH)
@@ -4469,9 +4483,9 @@ if test "$cross_compiling" = "yes"; then
mv config.log ../config.Build.log
mkdir -p ../config_build
mv config_host/*.h ../config_build
- . ./bin/get_config_variables OS PATH CC CXX INPATH SYSTEM_LIBXSLT OUTDIR WORKDIR
+ . ./bin/get_config_variables CC CXX INPATH INSTDIR INSTROOT LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS OUTDIR PATH SYSTEM_LIBXSLT WORKDIR
- for V in OS CC CXX INPATH SYSTEM_LIBXSLT; do
+ for V in CC CXX INPATH LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS SYSTEM_LIBXSLT; do
VV='$'$V
VV=`eval "echo $VV"`
if test -n "$VV"; then
@@ -4480,7 +4494,7 @@ if test "$cross_compiling" = "yes"; then
fi
done
- for V in OUTDIR WORKDIR; do
+ for V in INSTDIR INSTROOT OUTDIR WORKDIR; do
VV='$'$V
VV=`eval "echo $VV"`
VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
@@ -4505,11 +4519,21 @@ else
CC_FOR_BUILD="$CC"
CXX_FOR_BUILD="$CXX"
INPATH_FOR_BUILD="$INPATH"
+ INSTDIR_FOR_BUILD="$INSTDIR"
+ INSTROOT_FOR_BUILD="$INSTROOT"
+ LIBO_BIN_FOLDER_FOR_BUILD="$LIBO_BIN_FOLDER"
+ LIBO_LIB_FOLDER_FOR_BUILD="$LIBO_LIB_FOLDER"
+ LIBO_URE_LIB_FOLDER_FOR_BUILD="$LIBO_URE_LIB_FOLDER"
OUTDIR_FOR_BUILD="$OUTDIR"
WORKDIR_FOR_BUILD="$WORKDIR"
fi
AC_SUBST(OS_FOR_BUILD)
AC_SUBST(INPATH_FOR_BUILD)
+AC_SUBST(INSTDIR_FOR_BUILD)
+AC_SUBST(INSTROOT_FOR_BUILD)
+AC_SUBST(LIBO_BIN_FOLDER_FOR_BUILD)
+AC_SUBST(LIBO_LIB_FOLDER_FOR_BUILD)
+AC_SUBST(LIBO_URE_LIB_FOLDER_FOR_BUILD)
AC_SUBST(OUTDIR_FOR_BUILD)
AC_SUBST(WORKDIR_FOR_BUILD)
@@ -12179,15 +12203,6 @@ else
fi
AC_SUBST(WITH_COMPAT_OOWRAPPERS)
-AC_MSG_CHECKING([for product name])
-if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
- PRODUCTNAME=AC_PACKAGE_NAME"Dev"
-else
- PRODUCTNAME=AC_PACKAGE_NAME
-fi
-AC_MSG_RESULT([$PRODUCTNAME])
-AC_SUBST(PRODUCTNAME)
-
INSTALLDIRNAME=`echo AC_PACKAGE_NAME | tr '[[:upper:]]' '[[:lower:]]'`
AC_MSG_CHECKING([for install dirname])
if test -n "$with_install_dirname" -a "$with_install_dirname" != "no" -a "$with_install_dirname" != "yes"; then
diff --git a/ct2n/ExternalPackage_ct2n.mk b/ct2n/ExternalPackage_ct2n.mk
index ed77ba84d3cf..599e4335a3f1 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,ct2n,$(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 25fdbb6f80d3..a7f9bc0e2def 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,desktop_branding,$(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 eed749618cb7..e7ceefd3bd0a 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTROOT)))
$(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME),\
$(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
diff --git a/desktop/Package_desktop_install.mk b/desktop/Package_desktop_install.mk
index 6740f777f654..ad7a74ca8172 100644
--- a/desktop/Package_desktop_install.mk
+++ b/desktop/Package_desktop_install.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,desktop_install,$(SRCDIR)))
-$(eval $(call gb_Package_set_outdir,desktop_install,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,desktop_install,$(INSTROOT)))
$(eval $(call gb_Package_add_symbolic_link,desktop_install,program,MacOS))
diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk
index 2d36a59d190e..a3202071e17b 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT)))
ifneq ($(OS),WNT)
diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
index f1a58fef3341..8c5db5bff42a 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(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 1eafe020514e..545af571c83f 100644
--- a/extensions/Package_OOoSpotlightImporter.mk
+++ b/extensions/Package_OOoSpotlightImporter.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extensions_OOoSpotlightImporter,$(gb_Library_DLLDIR)))
-$(eval $(call gb_Package_set_outdir,extensions_OOoSpotlightImporter,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extensions_OOoSpotlightImporter,$(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 50ce85ee1e9b..6b812277213d 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extensions_mdibundle,$(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 3b0f2b9a0a35..c85032a3c60e 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,mingw_dlls,$(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 47896f045b54..dd68f10c4f95 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,msvc_dlls,$(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 505965147451..efa6c705451b 100644
--- a/extras/ExternalPackage_accessoriesgallery.mk
+++ b/extras/ExternalPackage_accessoriesgallery.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallery,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallery,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallery,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,$(LIBO_SHARE_FOLDER)/gallery,\
accessories/sg1010.sdg \
diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
index cb7e495d5275..1961f4cc5dd7 100644
--- a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
+++ b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
@@ -10,7 +10,7 @@
#$(eval $(call gb_Package_Package,extras_accessoriesgallerydrawspeople,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawspeople,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\
accessories/Draws/People/Baboo1.png \
diff --git a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
index ebb03afb791e..8a81b568a2a3 100644
--- a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
+++ b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelementsbullets2,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,$(LIBO_SHARE_FOLDER)/gallery/Elements/Bullets2,\
accessories/Elements/Bullets2/amethyst.arrow.png \
diff --git a/extras/ExternalPackage_accessoriesgallerynonfree.mk b/extras/ExternalPackage_accessoriesgallerynonfree.mk
index 4478ec434bb3..ea5d87288d63 100644
--- a/extras/ExternalPackage_accessoriesgallerynonfree.mk
+++ b/extras/ExternalPackage_accessoriesgallerynonfree.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerynonfree,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerynonfree,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerynonfree,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,$(LIBO_SHARE_FOLDER)/gallery,\
accessories-nonfree/sg600.sdg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
index f8859c9aa6d6..72c265c884fd 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosbuildings,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosbuildings,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosbuildings,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,$(LIBO_SHARE_FOLDER)/gallery/Photos/Buildings,\
accessories/Photos/Buildings/ArkSoft0408010009.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
index 2ff6d8356740..6af42c3e71c2 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscelebration,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscelebration,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscelebration,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,$(LIBO_SHARE_FOLDER)/gallery/Photos/Celebration,\
accessories/Photos/Celebration/JS_PDPhO_fireworks_burst.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
index 3b51346b1d97..82dc8ccdcd3a 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscities,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscities,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscities,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,$(LIBO_SHARE_FOLDER)/gallery/Photos/Cities,\
accessories/Photos/Cities/ArkSoft0507170040.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
index 0465ec448be6..8bf04c056f7b 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfauna,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfauna,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfauna,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,$(LIBO_SHARE_FOLDER)/gallery/Photos/Fauna,\
accessories/Photos/Fauna/ArkSoft0407030001.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
index 012517412daa..9cfbae6594c7 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosflowers,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosflowers,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosflowers,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,$(LIBO_SHARE_FOLDER)/gallery/Photos/Flowers,\
accessories/Photos/Flowers/1481157185_28ea113529_o.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
index 55bda0e360bd..7398ddb287fa 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfoodsanddrinks,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfoodsanddrinks,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfoodsanddrinks,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,$(LIBO_SHARE_FOLDER)/gallery/Photos/FoodsandDrinks,\
accessories/Photos/FoodsandDrinks/JS_PDPhO_beer.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
index 25e9864930cd..58215c825227 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoshumans,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoshumans,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoshumans,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,$(LIBO_SHARE_FOLDER)/gallery/Photos/Humans,\
accessories/Photos/Humans/1471425079_b3b53bdf5f_b.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
index b9ce827e929b..0f8fd559ccfb 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoslandscapes,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoslandscapes,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoslandscapes,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,$(LIBO_SHARE_FOLDER)/gallery/Photos/Landscapes,\
accessories/Photos/Landscapes/ArkSoft0405010010.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
index 07b0682ed83e..ee731b315c9f 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosobjects,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosobjects,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosobjects,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,$(LIBO_SHARE_FOLDER)/gallery/Photos/Objects,\
accessories/Photos/Objects/JS_PDPhO_dragon_celebration.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
index ca712fab942c..5cf1e84702f6 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosplants,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosplants,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosplants,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,$(LIBO_SHARE_FOLDER)/gallery/Photos/Plants,\
accessories/Photos/Plants/ArkSoft0405020018.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
index 9756690b6903..ad0ff113429e 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosspace,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosspace,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosspace,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,$(LIBO_SHARE_FOLDER)/gallery/Photos/Space,\
accessories/Photos/Space/Wikimedia_Space_120px-Atlantis_taking_off_on_STS-27.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
index 9b57f746cc3d..6be90e09c04e 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosstatues,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosstatues,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosstatues,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,$(LIBO_SHARE_FOLDER)/gallery/Photos/Statues,\
accessories/Photos/Statues/ArkSoft0507170027.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
index ac2323d97352..0b0aac66d08c 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotostravel,gallery-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotostravel,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotostravel,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,$(LIBO_SHARE_FOLDER)/gallery/Photos/Travel,\
accessories/Photos/Travel/JS_PDPhO_balloons_festival.jpg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommon.mk b/extras/ExternalPackage_accessoriestemplatescommon.mk
index 5b1c58545423..bdc80af62a54 100644
--- a/extras/ExternalPackage_accessoriestemplatescommon.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommon.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommon,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommon,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommon,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommon,$(LIBO_SHARE_FOLDER)/template/common,\
templates/common/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
index 558d880dd008..de8a553ba66d 100644
--- a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommoneducate,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommoneducate,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommoneducate,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommoneducate,$(LIBO_SHARE_FOLDER)/template/common/educate,\
templates/common/educate/A4-chequered.otg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
index ae287dd3073a..e8008783942f 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonfinance,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonfinance,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonfinance,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonfinance,$(LIBO_SHARE_FOLDER)/template/common/finance,\
templates/common/finance/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonforms.mk b/extras/ExternalPackage_accessoriestemplatescommonforms.mk
index 99b23c3bd24c..139820d7f402 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonforms.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonforms.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonforms,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonforms,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonforms,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonforms,$(LIBO_SHARE_FOLDER)/template/common/forms,\
templates/common/forms/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
index 7f60b328f3da..d5bf926b8dde 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlabels,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlabels,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlabels,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlabels,$(LIBO_SHARE_FOLDER)/template/common/labels,\
templates/common/labels/24_port_patch_text.otg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
index 4d4046084235..9e19b4b286d4 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlayout,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlayout,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlayout,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlayout,$(LIBO_SHARE_FOLDER)/template/common/layout,\
templates/common/layout/31407-squares.otp \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
index b6528235a1d0..3b548d95bd4b 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonmisc,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonmisc,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonmisc,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonmisc,$(LIBO_SHARE_FOLDER)/template/common/misc,\
templates/common/misc/White_Notebook_Paper_legal.ott \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
index 6caaf03efcf5..9cdbc3a49e0a 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonofficorr,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonofficorr,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonofficorr,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
templates/common/officorr/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
index 185d30925643..09d5815029f0 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonoffimisc,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonoffimisc,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonoffimisc,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonoffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
templates/common/offimisc/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
index 134df5f3bc90..fcb2ca890615 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpersonal,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpersonal,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpersonal,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\
templates/common/personal/szivesoldal.otg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
index f21808ce5332..732043f7e629 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpresent,templates-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpresent,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpresent,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpresent,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
templates/common/presnt/dummy_common_templates.txt \
diff --git a/extras/ExternalPackage_extra_fonts.mk b/extras/ExternalPackage_extra_fonts.mk
index 6ad5bf7e2ed3..f82e560fc55d 100644
--- a/extras/ExternalPackage_extra_fonts.mk
+++ b/extras/ExternalPackage_extra_fonts.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_extra_fonts,fonts-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack))
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index 4e4a1eae4811..d6d65dce704b 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autotext)))
-$(eval $(call gb_Package_set_outdir,extras_autocorr,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_autocorr,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr,\
acor_af-ZA.dat \
diff --git a/extras/Package_autotextuser.mk b/extras/Package_autotextuser.mk
index 56b7761bace2..64fd70d7762d 100644
--- a/extras/Package_autotextuser.mk
+++ b/extras/Package_autotextuser.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/autotext))
-$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_autotextuser,$(LIBO_SHARE_PRESETS_FOLDER)/autotext,\
mytexts.bau \
diff --git a/extras/Package_cfgsrvbitmapunx.mk b/extras/Package_cfgsrvbitmapunx.mk
index fcc34fb97127..483617d1351a 100644
--- a/extras/Package_cfgsrvbitmapunx.mk
+++ b/extras/Package_cfgsrvbitmapunx.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps))
-$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,$(LIBO_SHARE_FOLDER)/config,\
psetupl.xpm \
diff --git a/extras/Package_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk
index 0a711ee9cd47..7e90279cd759 100644
--- a/extras/Package_cfgsrvnolang.mk
+++ b/extras/Package_cfgsrvnolang.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_cfgsrvnolang,$(SRCDIR)/extras/source/misc_config))
-$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(INSTROOT)))
$(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,$(LIBO_SHARE_FOLDER)/config,\
wizard/form/styles/beige.css \
diff --git a/extras/Package_cfgusr.mk b/extras/Package_cfgusr.mk
index 2381f5dcdba3..41685ac64c98 100644
--- a/extras/Package_cfgusr.mk
+++ b/extras/Package_cfgusr.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_cfgusr,$(SRCDIR)/extras/source/misc_config))
-$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_cfgusr,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
autotbl.fmt \
diff --git a/extras/Package_database.mk b/extras/Package_database.mk
index cf89b5a88c0f..4d1c47e321cf 100644
--- a/extras/Package_database.mk
+++ b/extras/Package_database.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_database,$(SRCDIR)/extras/source/database))
-$(eval $(call gb_Package_set_outdir,extras_database,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_database,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_database,$(LIBO_SHARE_PRESETS_FOLDER)/database,\
biblio.odb \
diff --git a/extras/Package_databasebiblio.mk b/extras/Package_databasebiblio.mk
index 042af2d7ced9..459aa2520578 100644
--- a/extras/Package_databasebiblio.mk
+++ b/extras/Package_databasebiblio.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_databasebiblio,$(SRCDIR)/extras/source/database))
-$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_databasebiblio,$(LIBO_SHARE_PRESETS_FOLDER)/database/biblio,\
biblio.dbf \
diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk
index dfdd4d3d97e7..35210126a438 100644
--- a/extras/Package_fonts.mk
+++ b/extras/Package_fonts.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras))
-$(eval $(call gb_Package_set_outdir,extras_fonts,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_fonts,$(INSTROOT)))
$(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf))
diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk
index 0711b5298094..3044384c574c 100644
--- a/extras/Package_gallbullets.mk
+++ b/extras/Package_gallbullets.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
-$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_gallbullets,$(LIBO_SHARE_FOLDER)/gallery/bullets,\
blkpearl.gif \
diff --git a/extras/Package_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk
index 792004f2d9f0..4dadefabe81f 100644
--- a/extras/Package_gallhtmlexpo.mk
+++ b/extras/Package_gallhtmlexpo.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
-$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,$(LIBO_SHARE_FOLDER)/gallery/htmlexpo,\
bludown.gif \
diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index 858692cbfe63..964a5bcc6c1b 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gallery/gallery_mytheme))
-$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
sg30.sdv \
diff --git a/extras/Package_gallroot.mk b/extras/Package_gallroot.mk
index 30981b6344ea..b0b2fb722901 100644
--- a/extras/Package_gallroot.mk
+++ b/extras/Package_gallroot.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery))
-$(eval $(call gb_Package_set_outdir,extras_gallroot,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_gallroot,$(LIBO_SHARE_FOLDER)/gallery,\
apples.gif \
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index cd901bedbbf9..5a29baaf128e 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
-$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
sg1.sdg \
diff --git a/extras/Package_gallwwwback.mk b/extras/Package_gallwwwback.mk
index bcee303a045c..a989b1118639 100644
--- a/extras/Package_gallwwwback.mk
+++ b/extras/Package_gallwwwback.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gallery/www-back))
-$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_gallwwwback,$(LIBO_SHARE_FOLDER)/gallery/www-back,\
aqua.jpg \
diff --git a/extras/Package_gallwwwgraf.mk b/extras/Package_gallwwwgraf.mk
index e26d045c15e6..33725d4b74e5 100644
--- a/extras/Package_gallwwwgraf.mk
+++ b/extras/Package_gallwwwgraf.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf))
-$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_gallwwwgraf,$(LIBO_SHARE_FOLDER)/gallery/www-graf,\
bluat.gif \
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
index 192615f668db..2dbce19501da 100644
--- a/extras/Package_glade.mk
+++ b/extras/Package_glade.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade)))
-$(eval $(call gb_Package_set_outdir,extras_glade,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_glade,$(INSTROOT)))
$(eval $(call gb_Package_add_file,extras_glade,$(LIBO_SHARE_FOLDER)/glade/libreoffice-catalog.xml,libreoffice-catalog.xml))
diff --git a/extras/Package_labels.mk b/extras/Package_labels.mk
index 9d188d7e03d4..66b640873721 100644
--- a/extras/Package_labels.mk
+++ b/extras/Package_labels.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels))
-$(eval $(call gb_Package_set_outdir,extras_labels,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_labels,$(INSTROOT)))
$(eval $(call gb_Package_add_file,extras_labels,$(LIBO_SHARE_FOLDER)/labels/labels.xml,labels.xml))
diff --git a/extras/Package_newfiles.mk b/extras/Package_newfiles.mk
index 064face1631c..7517c7b0b4f8 100644
--- a/extras/Package_newfiles.mk
+++ b/extras/Package_newfiles.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_newfiles,$(SRCDIR)/extras/source/shellnew))
-$(eval $(call gb_Package_set_outdir,extras_newfiles,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_newfiles,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_newfiles,$(LIBO_SHARE_FOLDER)/template/shellnew,\
soffice.odg \
diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index 9cb6a9f95e26..f9aacba27a68 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palettes))
-$(eval $(call gb_Package_set_outdir,extras_palettes,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_palettes,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_palettes,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
arrowhd.soe \
diff --git a/extras/Package_tpllayoutimpr.mk b/extras/Package_tpllayoutimpr.mk
index fd6cda27cbba..255ee1b47cc3 100644
--- a/extras/Package_tpllayoutimpr.mk
+++ b/extras/Package_tpllayoutimpr.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_tpllayoutimpr,$(SRCDIR)/extras/source/templates/layout))
-$(eval $(call gb_Package_set_outdir,extras_tpllayoutimpr,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tpllayoutimpr,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_tpllayoutimpr,$(LIBO_SHARE_FOLDER)/template/common/layout,\
AbstractGreen.otp \
diff --git a/extras/Package_tplwizagenda.mk b/extras/Package_tplwizagenda.mk
index 654a5ee5039d..cbb8f4fc6978 100644
--- a/extras/Package_tplwizagenda.mk
+++ b/extras/Package_tplwizagenda.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_tplwizagenda,$(SRCDIR)/extras/source/templates/wizard/agenda))
-$(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_tplwizagenda,$(LIBO_SHARE_FOLDER)/template/common/wizard/agenda,\
10grey.ott \
diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk
index b6c47578f0de..e29068bc9f88 100644
--- a/extras/Package_tplwizbitmap.mk
+++ b/extras/Package_tplwizbitmap.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_tplwizbitmap,$(SRCDIR)/extras/source/templates/wizard/bitmap))
-$(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/template/wizard/bitmap,\
cancel_down.bmp \
diff --git a/extras/Package_tplwizdesktop.mk b/extras/Package_tplwizdesktop.mk
index 11776bb02b4b..1081f20b8ac2 100644
--- a/extras/Package_tplwizdesktop.mk
+++ b/extras/Package_tplwizdesktop.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_tplwizdesktop,$(SRCDIR)/extras/source/templates/wizard/desktop))
-$(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_tplwizdesktop,$(LIBO_SHARE_FOLDER)/template/common/internal,\
html.stw \
diff --git a/extras/Package_tplwizfax.mk b/extras/Package_tplwizfax.mk
index 2ed8936e3c99..be0e87a3a234 100644
--- a/extras/Package_tplwizfax.mk
+++ b/extras/Package_tplwizfax.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_tplwizfax,$(SRCDIR)/extras/source/templates/wizard/fax))
-$(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_tplwizfax,$(LIBO_SHARE_FOLDER)/template/common/wizard/fax,\
bus-classic_f.ott \
diff --git a/extras/Package_tplwizletter.mk b/extras/Package_tplwizletter.mk
index 625596307d81..386800f049a9 100644
--- a/extras/Package_tplwizletter.mk
+++ b/extras/Package_tplwizletter.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_tplwizletter,$(SRCDIR)/extras/source/templates/wizard/letter))
-$(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_tplwizletter,$(LIBO_SHARE_FOLDER)/template/common/wizard/letter,\
bus-elegant_l.ott \
diff --git a/extras/Package_tplwizreport.mk b/extras/Package_tplwizreport.mk
index 93517d50c9e7..d7a2ee5ffd65 100644
--- a/extras/Package_tplwizreport.mk
+++ b/extras/Package_tplwizreport.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_tplwizreport,$(SRCDIR)/extras/source/templates/wizard/report))
-$(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_tplwizreport,$(LIBO_SHARE_FOLDER)/template/common/wizard/report,\
cnt-011.ott \
diff --git a/extras/Package_tplwizstyles.mk b/extras/Package_tplwizstyles.mk
index f5b02647278a..9f8b64c5bcc5 100644
--- a/extras/Package_tplwizstyles.mk
+++ b/extras/Package_tplwizstyles.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,extras_tplwizstyles,$(SRCDIR)/extras/source/templates/wizard/styles))
-$(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(INSTROOT)))
$(eval $(call gb_Package_add_files,extras_tplwizstyles,$(LIBO_SHARE_FOLDER)/template/common/wizard/styles,\
blackberry.ots \
diff --git a/filter/Package_docbook.mk b/filter/Package_docbook.mk
index 12182e207315..aef359ae50df 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,filter_docbook,$(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 faaeca903a17..fae4b030dd30 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,filter_xhtml,$(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 2576f75865a6..cedc3ba4ed84 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,filter_xslt,$(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 dc5a754acb8f..1f4a40d8a4ca 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,framework_dtd,$(INSTROOT)))
$(eval $(call gb_Package_add_files,framework_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\
accelerator.dtd \
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index 9dfc764a4529..9c63373dd4bf 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -22,7 +22,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1)
$$(call gb_Helper_abbreviate_dirs, \
$$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
- -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)) \
+ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(gb_PROGRAMDIRNAME)) \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser)) \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index caada4f77655..84807e83a16c 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(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 b8a55be629b3..1bf679935932 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 $(gb_INSTROOT)/share/config/soffice.cfg $(appdir)/share/config
+ cp -R $(INSTROOT)/share/config/soffice.cfg $(appdir)/share/config
#
# "registry"
#
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
index e70d57b6d0bf..96f246c17121 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties,$(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 772ffd6d1689..ac7757d3731f 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(INSTROOT)))
ifneq ($(OS),WNT)
ifeq ($(OS),FREEBSD)
diff --git a/libexttextcat/ExternalPackage_fingerprint.mk b/libexttextcat/ExternalPackage_fingerprint.mk
index 597a44365637..027d1ce810eb 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,libexttextcat_fingerprint,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_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 4f8510cb4b29..0991d9621ea2 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,liblangtag_data,$(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 16e219c4d831..bbb6d04b8250 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,librelogo,$(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 05a36775fdf3..902d3dcbfb4b 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,librelogo_properties,$(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 447c72c9ba88..d307041af5db 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(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 4b0138acf409..2099d66f82f0 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(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 76fd346e2300..b3a43c879aac 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(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 e72fa4e43725..93af73aae165 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(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 279a87f1f0d6..4e08aa2bc42d 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(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 d0c4636b016a..53be59399312 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(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 2c868f5a2b0c..c9f0c988320d 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(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 8cf75d658f17..416d44e1016d 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(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 4d7f769cac2c..bf6d315bf865 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(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 a81534c87d50..021a51f4f379 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(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 639636b886dc..04b24864de1c 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,moz_runtime,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,$(gb_Package_PROGRAMDIRNAME),\
components/addrbook.dll \
diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk
index 5640669ea217..651994fd9486 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,officecfg_misc,$(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 b8cced4e3fd8..0adcad89168b 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,package_dtd,$(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 b4f5e8543a6a..5f96e1849dfc 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,padmin,$(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 8e892a12461e..d44a41ebe390 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 $< $(gb_INSTROOT)/$(gb_UIConfig_INSTDIR) $@)
+ $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@)
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
index f550af3e7a62..5a7c582bf36b 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,postprocess_images,$(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 5f8ed00cdee7..ba1d51605489 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(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 33de345cb06b..744a1bbeb704 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(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 7a04ec779830..f52ea7dadc21 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(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 6c513090b21a..9448e258c306 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,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,python3,$(INSTROOT)))
$(eval $(call gb_ExternalPackage_use_external_project,python3,python3))
diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk
index 823407127d06..d8854eb790dd 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,$(gb_INSTROOT)/$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(gb_Package_PROGRAMDIRNAME))/LibreOfficePython.framework,LibreOfficePython.framework))
+$(eval $(call gb_GeneratedPackage_add_dir,python3,$(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 c4fbfdd21869..0a76e0249e92 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(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 7492be12db08..a986d72900f3 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,python_shell,$(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 a637ce7c8665..4551df8bebd4 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,reportbuilder-templates,$(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 8a3daf3b9329..b495566f9b1a 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(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 17519cf60b48..241f220cf825 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(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 2f284b3627e5..b48c08d6a325 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(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 79fb9beab077..1ecd5d6fbc18 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_java,$(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 9832a959e1e6..bb2fc38604fa 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(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 2ebdc1045669..0d5f278f275f 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(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 d92dec47d643..b946bcbb6648 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(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 0e7d975ac7d6..d3810b716922 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,sd_opengl,$(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 3bb393797906..297373583b6e 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,sd_web,$(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 e06aab66f1cc..449252b2024e 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,sd_xml,$(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 b0396826cbda..a2af65128684 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,shell_scripts,$(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 0fb01b7291b8..15c3015b78fd 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,shell_scripts_gnome,$(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 a3c8b8bb9fcb..c262ffa3dcc4 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,shell_scripts_kde,$(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 cc6dcfcb8071..be498e781f88 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,shell_senddoc,$(INSTROOT)))
$(eval $(call gb_Package_add_file,shell_senddoc,$(gb_PROGRAMDIRNAME)/senddoc,senddoc.sh))
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index 1bc9dae2952b..5909c309467c 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
$(eval $(call gb_CppunitTest_use_ure,smoketest))
ifeq ($(ENABLE_MACOSX_SANDBOX),TRUE)
-userinstallation=$(shell $(gb_DEVINSTALLROOT)/MacOS/soffice --nstemporarydirectory)
+userinstallation=$(shell $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice --nstemporarydirectory)
else
userinstallation=$(WORKDIR)/CustomTarget/smoketest
endif
diff --git a/smoketest/Executable_libtest.mk b/smoketest/Executable_libtest.mk
index f8bfcaff000a..dfab98dfa0e6 100644
--- a/smoketest/Executable_libtest.mk
+++ b/smoketest/Executable_libtest.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_Executable_add_exception_objects,libtest,\
smoketest/libtest \
))
-liblibreoffice_OWN_LD_PATH_DIR := $(gb_DEVINSTALLROOT)/program/libolib
+liblibreoffice_OWN_LD_PATH_DIR := $(INSTROOT)/program/libolib
liblibreoffice_OWN_LD_SO := $(liblibreoffice_OWN_LD_PATH_DIR)/$(call gb_Library__get_workdir_linktargetname,libreoffice)
$(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice)
@@ -37,6 +37,6 @@ $(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice)
run_libtest: $(liblibreoffice_OWN_LD_SO)
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(liblibreoffice_OWN_LD_PATH_DIR)/Library" \
$(WORKDIR)/LinkTarget/Executable/libtest \
- $(gb_DEVINSTALLROOT)/program $(OUTDIR)/bin/smoketestdoc.sxw \
+ $(INSTROOT)/program $(OUTDIR)/bin/smoketestdoc.sxw \
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk
index 7039a2ea8021..e8a2a19e3070 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 $(gb_INSTROOT).
+# language. The package files are placed into $(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),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(2),$(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 0265bbadd9a6..d11b5d943a73 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -458,7 +458,7 @@ $(call gb_AllLangResTarget_get_target,%) :
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && touch $@)
-gb_ResTarget_get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/resource/$(1).res
+gb_ResTarget_get_install_target = $(INSTROOT)/$(gb_PROGRAMDIRNAME)/resource/$(1).res
define gb_AllLangResTarget_AllLangResTarget
$(foreach lang,$(gb_AllLangResTarget_LANGS),\
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index aeda7e3e0fae..1f9390fe5fb0 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -59,8 +59,8 @@ $(if $(URE),\
"-env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call gb_Helper_make_url,$(item)))") \
$(if $(strip $(UNO_SERVICES)),\
"-env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call gb_Helper_make_url,$(item)))") \
- -env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
- -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)) \
+ -env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
+ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(gb_PROGRAMDIRNAME)) \
--protector $(call gb_Library_get_target,unoexceptionprotector) unoexceptionprotector \
--protector $(call gb_Library_get_target,unobootstrapprotector) unobootstrapprotector \
) $(ARGS)
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index a1e4d614430b..1803bf469a7b 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)),$(gb_INSTROOT))
-$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)),$(INSTROOT))
+$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(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 ef632dd33cc6..2fd5c1d7444a 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -23,11 +23,17 @@
# gb_Executable_Executable_platform
gb_Executable_LAYER_DIRS := \
- UREBIN:$(gb_INSTROOT)/$(LIBO_URE_BIN_FOLDER) \
- OOO:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME) \
+ UREBIN:$(INSTROOT)/$(LIBO_URE_BIN_FOLDER) \
+ OOO:$(INSTROOT)/$(LIBO_BIN_FOLDER) \
SDKBIN:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/bin \
NONE:$(gb_Executable_BINDIR) \
+gb_Executable_LAYER_DIRS_FOR_BUILD := \
+ UREBIN:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_BIN_FOLDER_FOR_BUILD) \
+ OOO:$(INSTROOT_FOR_BUILD)/$(LIBO_BIN_FOLDER_FOR_BUILD) \
+ SDKBIN:$(INSTDIR_FOR_BUILD)/$(gb_Package_SDKDIRNAME)/bin \
+ NONE:$(gb_Executable_BINDIR_FOR_BUILD) \
+
$(dir $(call gb_Executable_get_runtime_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
@@ -45,8 +51,11 @@ $(call gb_Executable_get_clean_target,%) :
$(AUXTARGETS))
gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS)))
+gb_Executable__get_dir_for_layer_for_build = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS_FOR_BUILD)))
gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1)))
+gb_Executable__get_dir_for_exe_for_build = $(call gb_Executable__get_dir_for_layer_for_build,$(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))
+gb_Executable_get_install_target_for_build = $(call gb_Executable__get_dir_for_exe_for_build,$(1))/$(call gb_Executable_get_filename,$(1))
define gb_Executable_Executable
$(call gb_Postprocess_register_target,AllExecutables,Executable,$(1))
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index c52ffff334ac..19fea8d6e728 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -211,14 +211,14 @@ 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
-# $(gb_INSTROOT).
+# $(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.
#
# gb_ExternalPackage_add_library_for_install package dest src library?
define gb_ExternalPackage_add_library_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(gb_INSTROOT)/$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(INSTROOT)/$(gb_Package_PROGRAMDIRNAME))/$(notdir $(2)),$(3))
endef
@@ -234,11 +234,11 @@ 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
-# $(gb_INSTROOT).
+# $(INSTROOT).
#
# gb_ExternalPackage_add_jar_for_install package dest src
define gb_ExternalPackage_add_jar_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(gb_INSTROOT)/$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3))
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(INSTROOT)/$(gb_Package_PROGRAMDIRNAME)/classes/$(notdir $(2)),$(3))
endef
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index ecf9cf9becdd..0feab816a39c 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -53,8 +53,8 @@ define gb_Gallery__make_env_args
$(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \
"-env:UNO_TYPES=$(foreach item,$(gb_Gallery__UNO_TYPES),\
$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \
--env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
--env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME))
+-env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
+-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(gb_PROGRAMDIRNAME))
endef
define gb_Gallery__command
@@ -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)),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(call gb_Gallery_get_files_packagename,$(1)),$(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),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(2),$(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/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 06002c433754..a194d0b20dd0 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),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(5),$(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 155fa928def0..cef34e86ffae 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):%,$(gb_INSTROOT)/%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS)))
+gb_Jar__get_dir_for_layer = $(patsubst $(1):%,$(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/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index ad3d5250d3dc..3d01c5c5e361 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -57,7 +57,7 @@ $(call gb_JunitTest_get_target,%) :
$(CLEAN_CMD)
define gb_JunitTest_JunitTest
-$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER)
+$(call gb_JunitTest_get_target,$(1)) : T_CP := $(call gb_JavaClassSet_get_classdir,$(call gb_JunitTest_get_classsetname,$(1)))$$(gb_CLASSPATHSEP)$(OOO_JUNIT_JAR)$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)
$(call gb_JunitTest_get_target,$(1)) : CLASSES :=
$(eval $(call gb_JunitTest_JunitTest_platform,$(1)))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a09f48aac4b6..e0ad137a1cfd 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -30,9 +30,9 @@
# gb_Library_Library_platform
gb_Library_LAYER_DIRS := \
- URELIB:$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER) \
- OOO:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME) \
- SHLXTHDL:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/shlxthdl \
+ URELIB:$(INSTROOT)/$(LIBO_URE_LIB_FOLDER) \
+ OOO:$(INSTROOT)/$(gb_PROGRAMDIRNAME) \
+ SHLXTHDL:$(INSTROOT)/$(gb_PROGRAMDIRNAME)/shlxthdl \
OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \
NONE:$(gb_Library_DLLDIR) \
@@ -71,9 +71,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),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,Library_Copy_$(1),$(INSTROOT))
$(call gb_Package_add_file,Library_Copy_$(1),$(2),$(2))
-$(OUTDIR)/lib/$(notdir $(2)) : $(gb_INSTROOT)/$(2)
+$(OUTDIR)/lib/$(notdir $(2)) : $(INSTROOT)/$(2)
endef
# Note: there may be targets in 3 different directories: the library itself,
diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk
index 9753a41a746d..93e218bf1ca5 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 = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
+gb_Pagein__get_install_target = $(INSTROOT)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
define gb_Pagein__command
$(call gb_Output_announce,$(2),$(true),PAG,5)
diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk
index fb1b3d62b9ca..45d217f78ef7 100644
--- a/solenv/gbuild/PythonTest.mk
+++ b/solenv/gbuild/PythonTest.mk
@@ -42,7 +42,7 @@ $(call gb_PythonTest_get_target,%) :
$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(DEFS) \
TEST_LIB=$(call gb_Library_get_target,test) \
- URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(gb_DEVINSTALLROOT)/$(LIBO_ETC_FOLDER)/fundamental) \
+ URE_BOOTSTRAP=vnd.sun.star.pathname:$(call gb_Helper_get_rcfile,$(INSTROOT)/$(LIBO_ETC_FOLDER)/fundamental) \
PYTHONPATH="$(PYPATH)" \
UserInstallation=$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*))user) \
TestUserDir="$(call gb_Helper_make_url,$(dir $(call gb_PythonTest_get_target,$*)))" \
@@ -58,7 +58,7 @@ $(call gb_PythonTest_get_target,%) :
# always use udkapi and URE services
define gb_PythonTest_PythonTest
-$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/$(LIBO_LIB_PYUNO_FOLDER)$(if $(filter-out $(LIBO_LIB_PYUNO_FOLDER),$(LIBO_LIB_FOLDER)),$(gb_CLASSPATHSEP)$(gb_DEVINSTALLROOT)/$(LIBO_LIB_FOLDER))
+$(call gb_PythonTest_get_target,$(1)) : PYPATH := $(SRCDIR)/unotest/source/python$$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_LIB_PYUNO_FOLDER)$(if $(filter-out $(LIBO_LIB_PYUNO_FOLDER),$(LIBO_LIB_FOLDER)),$(gb_CLASSPATHSEP)$(INSTROOT)/$(LIBO_LIB_FOLDER))
$(call gb_PythonTest_get_target,$(1)) : MODULES :=
$(eval $(call gb_Module_register_target,$(call gb_PythonTest_get_target,$(1)),$(call gb_PythonTest_get_clean_target,$(1))))
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index a428bb36a502..a4d310447e04 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)),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(call gb_Pyuno_get_packagename,$(1)),$(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 b3dcaff109d3..3a39897fcd5f 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 = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb
+gb_Rdb__get_install_target = $(INSTROOT)/$(gb_PROGRAMDIRNAME)/services/$(1).rdb
define gb_Rdb__command
$(call gb_Helper_abbreviate_dirs,\
@@ -45,9 +45,9 @@ endef
# FIXME this needs some layer-like thing for the special case in URE
define gb_Rdb_Rdb_install
-$(call gb_Rdb__Rdb_impl,$(1),$(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))))
+$(call gb_Rdb__Rdb_impl,$(1),$(if $(2),$(INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))))
$(call gb_Helper_install_final, \
- $(if $(2),$(gb_INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))), \
+ $(if $(2),$(INSTROOT)/$(2),$(call gb_Rdb__get_install_target,$(1))), \
$(call gb_Rdb_get_target,$(1)))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index a0287a3fe33f..6cf9434177b6 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -47,8 +47,12 @@ gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
gb_Executable_get_target = $(gb_Executable__get_linktarget_target)
-# FIXME broken
+ifneq ($(CROSS_COMPILING),)
+# Can we assume this is used only for executables registered for "NONE"?
+gb_Executable_get_target_for_build = $(call gb_Executable_get_install_target_for_build,$(1))
+else
gb_Executable_get_target_for_build = $(gb_Executable__get_linktarget_target)
+endif
# FIXME: cleanup?
gb_Library_get_target = $(gb_Library__get_linktarget_target)
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 50fbfb318908..e2c17672d103 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)),$(gb_INSTROOT))
-$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)_generated),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)),$(INSTROOT))
+$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)_generated),$(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)),$(gb_INSTROOT))
+$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(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 79da2d90c021..455cbec814a6 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -38,7 +38,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)), \
- $(gb_INSTROOT)/$(2), \
+ $(INSTROOT)/$(2), \
$(call gb_UnoApiTarget_get_target,$(1)))
endef
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index bb661b3e57e5..8d4f7ebd3835 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -28,9 +28,6 @@ endif
gb_COMPILERDEFAULTOPTFLAGS := -O3
-gb_INSTROOT := $(INSTDIR)
-gb_DEVINSTALLROOT := $(gb_INSTROOT)
-
include $(GBUILDDIR)/platform/com_GCC_defs.mk
# Darwin mktemp -t expects a prefix, not a pattern
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index faba1705e0a6..7cb29836a8a3 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -181,7 +181,7 @@ else
gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
endif
-gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(gb_INSTROOT)/$(LIBO_URE_LIB_FOLDER):$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)"
+gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)"
# $(1): list of directory pathnames to append at the end of the ld path
define gb_Helper_extend_ld_path
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 026e77559ec9..61e452737e84 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -17,9 +17,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_INSTROOT := $(INSTDIR)
-gb_DEVINSTALLROOT := $(gb_INSTROOT)
-
# Convert path to file URL.
define gb_Helper_make_url
file:///$(strip $(1))
@@ -424,14 +421,14 @@ else
ifneq ($(gb_JunitTest_DEBUGRUN),)
gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
else
-gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/program/soffice
+gb_JunitTest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice
endif
endif
define gb_JunitTest_JunitTest_platform
$(call gb_JunitTest_get_target,$(1)) : DEFS := \
- -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(gb_DEVINSTALLROOT)/program/soffice.exe}" \
+ -Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.exe}" \
-Dorg.openoffice.test.arg.env=PATH="$$$$PATH" \
-Dorg.openoffice.test.arg.user=$(call gb_Helper_make_url,$(call gb_JunitTest_get_userdir,$(1)))
@@ -577,6 +574,6 @@ gb_UIMenubarTarget_UIMenubarTarget_platform :=
# Python
gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program"
-gb_Python_INSTALLED_EXECUTABLE := $(gb_DEVINSTALLROOT)/program/python.exe
+gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 287a8ebc4ae3..be5a01980e23 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -17,9 +17,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_INSTROOT := $(INSTDIR)/$(PRODUCTNAME).app/Contents
-gb_DEVINSTALLROOT := $(gb_INSTROOT)
-
gb_SDKDIR := $(MACOSX_SDK_PATH)
include $(GBUILDDIR)/platform/com_GCC_defs.mk
@@ -300,7 +297,7 @@ else
ifneq ($(gb_JunitTest_DEBUGRUN),)
gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
else
-gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/MacOS/soffice
+gb_JunitTest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice
endif
endif
@@ -315,9 +312,9 @@ endef
# PythonTest class
-gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(gb_DEVINSTALLROOT)/$(LIBO_URE_LIB_FOLDER)
+gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)
ifneq ($(LIBO_LIB_FOLDER),$(LIBO_URE_LIB_FOLDER))
-gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(gb_DEVINSTALLROOT)/$(LIBO_LIB_FOLDER)
+gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(INSTROOT)/$(LIBO_LIB_FOLDER)
endif
gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib
@@ -326,7 +323,7 @@ gb_PythonTest_PRECOMMAND := $(gb_PythonTest_PRECOMMAND):$(OUTDIR)/lib
define gb_Module_DEBUGRUNCOMMAND
OFFICESCRIPT=$$($(gb_MKTEMP)) && \
printf '%s\n' "set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)" > $${OFFICESCRIPT} && \
-gdb -x $${OFFICESCRIPT} $(gb_DEVINSTALLROOT)/MacOS/soffice && \
+gdb -x $${OFFICESCRIPT} $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice && \
rm $${OFFICESCRIPT}
endef
@@ -391,7 +388,7 @@ endef
# Python
gb_Python_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
-gb_Python_INSTALLED_EXECUTABLE := $(gb_DEVINSTALLROOT)/$(LIBO_LIB_FOLDER)/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython
+gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_LIB_FOLDER)/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/Resources/Python.app/Contents/MacOS/LibreOfficePython
# this is passed to gdb as executable when running tests
gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_Python_INSTALLED_EXECUTABLE)
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index c4fb456c0064..5b13981737ea 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -17,9 +17,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_INSTROOT := $(INSTDIR)
-gb_DEVINSTALLROOT := $(gb_INSTROOT)
-
gb_RC := $(WINDRES)
gb_COMPILERDEFS += \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 017dafc6bc9b..7603be4294e1 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -17,9 +17,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_INSTROOT := $(INSTDIR)
-gb_DEVINSTALLROOT := $(gb_INSTROOT)
-
include $(GBUILDDIR)/platform/com_GCC_defs.mk
gb_MKTEMP := mktemp -t gbuild.XXXXXX
@@ -329,7 +326,7 @@ else
ifneq ($(gb_JunitTest_DEBUGRUN),)
gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
else
-gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/program/soffice
+gb_JunitTest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice
endif
endif
@@ -352,8 +349,8 @@ gb_PythonTest_PRECOMMAND :=
define gb_Module_DEBUGRUNCOMMAND
OFFICESCRIPT=`mktemp` && \
-printf ". $(gb_DEVINSTALLROOT)/program/ooenv\\n" > $${OFFICESCRIPT} && \
-printf "gdb --tui $(gb_DEVINSTALLROOT)/program/soffice.bin" >> $${OFFICESCRIPT} && \
+printf ". $(INSTROOT)/program/ooenv\\n" > $${OFFICESCRIPT} && \
+printf "gdb --tui $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.bin" >> $${OFFICESCRIPT} && \
printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)\"" >> $${OFFICESCRIPT} && \
printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \
$(SHELL) $${OFFICESCRIPT} && \
@@ -411,9 +408,9 @@ gb_UIMenubarTarget_UIMenubarTarget_platform :=
# Python
gb_Python_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib:$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload"
-gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(gb_DEVINSTALLROOT)/program/python
+gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(INSTROOT)/program/python
# this is passed to gdb as executable when running tests
-gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_DEVINSTALLROOT)/program/python.bin
+gb_Python_INSTALLED_EXECUTABLE_GDB := $(INSTROOT)/program/python.bin
include $(GBUILDDIR)/platform/com_GCC_class.mk
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 9ad883b85503..54ef9040de4c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -17,9 +17,6 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_INSTROOT := $(INSTDIR)
-gb_DEVINSTALLROOT := $(gb_INSTROOT)
-
include $(GBUILDDIR)/platform/com_GCC_defs.mk
gb_MKTEMP := mktemp -t gbuild.XXXXXX
@@ -325,7 +322,7 @@ else
ifneq ($(gb_JunitTest_DEBUGRUN),)
gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
else
-gb_JunitTest_SOFFICEARG:=path:$(gb_DEVINSTALLROOT)/program/soffice
+gb_JunitTest_SOFFICEARG:=path:$(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice
endif
endif
@@ -341,14 +338,14 @@ endef
# PythonTest class
-gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(gb_DEVINSTALLROOT)/ure-link/lib:$(gb_DEVINSTALLROOT)/program:$(OUTDIR)/lib
+gb_PythonTest_PRECOMMAND := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}$(INSTROOT)/$(LIBO_URE_LIB_FOLDER):$(INSTROOT)/$(LIBO_LIB_FOLDER):$(OUTDIR)/lib
# Module class
define gb_Module_DEBUGRUNCOMMAND
OFFICESCRIPT=`mktemp` && \
-printf 'if [ -e $(gb_DEVINSTALLROOT)/program/ooenv ]; then . $(gb_DEVINSTALLROOT)/program/ooenv; fi\n' > $${OFFICESCRIPT} && \
-printf "gdb $(gb_DEVINSTALLROOT)/program/soffice.bin" >> $${OFFICESCRIPT} && \
+printf 'if [ -e $(INSTROOT)/program/ooenv ]; then . $(INSTROOT)/program/ooenv; fi\n' > $${OFFICESCRIPT} && \
+printf "gdb $(INSTROOT)/$(LIBO_BIN_FOLDER)/soffice.bin" >> $${OFFICESCRIPT} && \
printf " -ex \"set args --norestore --nologo '--accept=pipe,name=$(USER);urp;' -env:UserInstallation=$(gb_USER_INSTALLATION)\"" >> $${OFFICESCRIPT} && \
$(SHELL) $${OFFICESCRIPT} && \
rm $${OFFICESCRIPT}
@@ -408,9 +405,9 @@ gb_UIMenubarTarget_UIMenubarTarget_platform :=
# Python
gb_Python_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib:$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload"
-gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(gb_DEVINSTALLROOT)/program/python
+gb_Python_INSTALLED_EXECUTABLE := /bin/sh $(INSTROOT)/program/python
# this is passed to gdb as executable when running tests
-gb_Python_INSTALLED_EXECUTABLE_GDB := $(gb_DEVINSTALLROOT)/program/python.bin
+gb_Python_INSTALLED_EXECUTABLE_GDB := $(INSTROOT)/program/python.bin
include $(GBUILDDIR)/platform/com_GCC_class.mk
diff --git a/sysui/Package_infoplist.mk b/sysui/Package_infoplist.mk
index db815dd32922..483a926a8227 100644
--- a/sysui/Package_infoplist.mk
+++ b/sysui/Package_infoplist.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,infoplist,$(call gb_CustomTarget_get_workdir,sysui/infoplist)))
-$(eval $(call gb_Package_set_outdir,infoplist,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,infoplist,$(INSTROOT)))
$(eval $(call gb_Package_add_files,infoplist,,\
PkgInfo \
diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk
index 2f587d550fff..117227b78de3 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(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 cfe8fbda17d3..53a97f52ac0a 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,ure_install,$(INSTROOT)))
ifneq (WNT,$(OS))
ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),)
diff --git a/vcl/Package_osxres.mk b/vcl/Package_osxres.mk
index 9947efaa397c..572b4b0e4d45 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,vcl_osxres,$(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 6080e6311438..081df3c67b10 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(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 0f80d8eea422..c3de389b97f4 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(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 54c47a0c4a56..0a1f40dc4fe6 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(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 1844845d5259..a3aab6986355 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(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 f2d187ec8eda..44743de2e144 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(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 ed9a863224de..4c60107f20c4 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicshare,$(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 294ca32ec3a6..ac7d9ee8da75 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,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicsrvstandard,$(LIBO_SHARE_PRESETS_FOLDER)/basic/Standard,\
dialog.xlb \
diff --git a/wizards/Package_template.mk b/wizards/Package_template.mk
index 1d9225e84225..cc07dc80a9fe 100644
--- a/wizards/Package_template.mk
+++ b/wizards/Package_template.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicsrvtemplate,$(SRCDIR)/wizards/source/template))
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicsrvtemplate,$(LIBO_SHARE_FOLDER)/basic/Template,\
Autotext.xba \
diff --git a/wizards/Package_tools.mk b/wizards/Package_tools.mk
index 309468b991a3..ef0a0aa3d3d5 100644
--- a/wizards/Package_tools.mk
+++ b/wizards/Package_tools.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicsrvtools,$(SRCDIR)/wizards/source/tools))
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvtools,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvtools,$(INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicsrvtools,$(LIBO_SHARE_FOLDER)/basic/Tools,\
Debug.xba \
diff --git a/wizards/Package_tutorials.mk b/wizards/Package_tutorials.mk
index fb553c4f7a5b..8520f5d09575 100644
--- a/wizards/Package_tutorials.mk
+++ b/wizards/Package_tutorials.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicsrvtutorials,$(SRCDIR)/wizards/source/tutorials))
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvtutorials,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvtutorials,$(INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicsrvtutorials,$(LIBO_SHARE_FOLDER)/basic/Tutorials,\
dialog.xlb \
diff --git a/wizards/Package_usr.mk b/wizards/Package_usr.mk
index 08c3ee69b890..a826784ee3d8 100644
--- a/wizards/Package_usr.mk
+++ b/wizards/Package_usr.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,wizards_basicusr,$(SRCDIR)/wizards/source/config))
-$(eval $(call gb_Package_set_outdir,wizards_basicusr,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicusr,$(INSTROOT)))
$(eval $(call gb_Package_add_files,wizards_basicusr,$(LIBO_SHARE_PRESETS_FOLDER)/basic,\
dialog.xlc \
diff --git a/xmlhelp/Package_helpxsl.mk b/xmlhelp/Package_helpxsl.mk
index e9f3bf21965f..1ed3adae8aa8 100644
--- a/xmlhelp/Package_helpxsl.mk
+++ b/xmlhelp/Package_helpxsl.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,xmlhelp_helpxsl,$(SRCDIR)/xmlhelp/util))
-$(eval $(call gb_Package_set_outdir,xmlhelp_helpxsl,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,xmlhelp_helpxsl,$(INSTROOT)))
$(eval $(call gb_Package_add_files,xmlhelp_helpxsl,$(LIBO_SHARE_HELP_FOLDER),\
idxcaption.xsl \
diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk
index 134d15413e92..c0b99554c524 100644
--- a/xmloff/Package_dtd.mk
+++ b/xmloff/Package_dtd.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Package_Package,xmloff_dtd,$(SRCDIR)/xmloff/dtd))
-$(eval $(call gb_Package_set_outdir,xmloff_dtd,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,xmloff_dtd,$(INSTROOT)))
$(eval $(call gb_Package_add_files,xmloff_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\
chart.mod \
diff --git a/xmlscript/Package_dtd.mk b/xmlscript/Package_dtd.mk
index b60ede9ffd77..13134846ad32 100644
--- a/xmlscript/Package_dtd.mk
+++ b/xmlscript/Package_dtd.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,xmlscript_dtd,$(SRCDIR)/xmlscript))
-$(eval $(call gb_Package_set_outdir,xmlscript_dtd,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,xmlscript_dtd,$(INSTROOT)))
$(eval $(call gb_Package_add_files,xmlscript_dtd,$(LIBO_SHARE_FOLDER)/dtd/officedocument/1_0,\
dtd/dialog.dtd \