[Libreoffice-commits] core.git: 7 commits - bridges/Package_jnilib_java_uno.mk cli_ure/Package_cli_basetypes_copy.mk cli_ure/Package_version.mk connectivity/Package_postgresql-sdbc.mk desktop/Package_branding_custom.mk desktop/Package_branding.mk desktop/Package_desktop_install.mk desktop/Package_scripts.mk desktop/Package_soffice_sh.mk extensions/Package_mdibundle.mk extensions/Package_OOoSpotlightImporter.mk external/afms external/apache-commons external/beanshell external/cairo external/ct2n external/curl external/firebird external/hsqldb external/icu external/jfreereport external/lcms2 external/libexttextcat external/liblangtag external/libxml2 external/libxslt external/lpsolve external/mingw-externals external/more_fonts external/moz external/msc-externals extras/ExternalPackage_accessoriesgallerydrawspeople.mk extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk extras/ExternalPackage_accessoriesgallery.mk extras/ExternalPackage_accessoriesgallerynonfree.mk extras/ExternalPa ckage_accessoriesgalleryphotosbuildings.mk extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk extras/ExternalPackage_accessoriesgalleryphotoscities.mk extras/ExternalPackage_accessoriesgalleryphotosfauna.mk extras/ExternalPackage_accessoriesgalleryphotosflowers.mk extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk extras/ExternalPackage_accessoriesgalleryphotoshumans.mk extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk extras/ExternalPackage_accessoriesgalleryphotosobjects.mk extras/ExternalPackage_accessoriesgalleryphotosplants.mk extras/ExternalPackage_accessoriesgalleryphotosspace.mk extras/ExternalPackage_accessoriesgalleryphotosstatues.mk extras/ExternalPackage_accessoriesgalleryphotostravel.mk extras/ExternalPackage_accessoriestemplatescommoneducate.mk extras/ExternalPackage_accessoriestemplatescommonfinance.mk extras/ExternalPackage_accessoriestemplatescommonforms.mk extras/ExternalPackage_accessoriestemplatescommonlabels.mk extras/ ExternalPackage_accessoriestemplatescommonlayout.mk extras/ExternalPackage_accessoriestemplatescommonmisc.mk extras/ExternalPackage_accessoriestemplatescommon.mk extras/ExternalPackage_accessoriestemplatescommonofficorr.mk extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk extras/ExternalPackage_accessoriestemplatescommonpersonal.mk extras/ExternalPackage_accessoriestemplatescommonpresent.mk extras/ExternalPackage_extra_fonts.mk extras/Package_autocorr.mk extras/Package_autotextuser.mk extras/Package_cfgsrvbitmapunx.mk extras/Package_cfgsrvnolang.mk extras/Package_cfgusr.mk extras/Package_databasebiblio.mk extras/Package_database.mk extras/Package_extensions.mk extras/Package_fonts.mk extras/Package_gallbullets.mk extras/Package_gallhtmlexpo.mk extras/Package_gallmytheme.mk extras/Package_gallroot.mk extras/Package_gallsystem.mk extras/Package_gallwwwback.mk extras/Package_gallwwwgraf.mk extras/Package_glade.mk extras/Package_labels.mk extras/Package_newfiles.mk ex tras/Package_palettes.mk extras/Package_tpllayoutimpr.mk extras/Package_tplwizagenda.mk extras/Package_tplwizbitmap.mk extras/Package_tplwizdesktop.mk extras/Package_tplwizfax.mk extras/Package_tplwizletter.mk extras/Package_tplwizreport.mk extras/Package_tplwizstyles.mk extras/Package_wordbook.mk filter/Package_docbook.mk filter/Package_xhtml.mk filter/Package_xslt.mk framework/Package_dtd.mk instsetoo_native/Package_setup.mk jvmfwk/Module_jvmfwk.mk jvmfwk/Package_jreproperties.mk jvmfwk/Package_jreproperties_solver.mk jvmfwk/Package_rcfiles.mk jvmfwk/Package_rcfiles_solver.mk l10ntools/Package_ulfconv.mk languagetool/Package_languagetool.mk librelogo/Package_librelogo.mk librelogo/Package_librelogo_properties.mk libxmlsec/ExternalPackage_xmlsec.mk nss/ExternalPackage_nss.mk officecfg/Package_misc.mk openssl/ExternalPackage_openssl.mk package/Package_dtd.mk padmin/Package_padmin.mk postprocess/Package_images.mk postprocess/Package_registry.mk psprint_config/Package_fontunxp pds.mk psprint_config/Package_fontunxpsprint.mk python3/ExternalPackage_python3.mk pyuno/Package_python_scripts.mk pyuno/Package_python_shell.mk pyuno/Package_zipcore.mk readlicense_oo/Package_files.mk readlicense_oo/Package_license.mk readlicense_oo/Package_readme.mk redland/ExternalPackage_raptor.mk redland/ExternalPackage_rasqal.mk redland/ExternalPackage_redland.mk reportbuilder/Package_reportbuilder-templates.mk rhino/ExternalPackage_rhino.mk scripting/Package_java_jars.mk scripting/Package_java.mk scripting/Package_scriptbindinglib.mk scripting/Package_scriptproviderforpython.mk scripting/Package_ScriptsBeanShell.mk scripting/Package_ScriptsJavaScript.mk scripting/Package_ScriptsPython.mk sdext/Package_pdfimport_xpdfimport.mk sd/Package_opengl.mk sd/Package_web.mk sd/Package_xml.mk setup_native/Package_misc.mk setup_native/Package_packinfo.mk setup_native/Package_scripts_generated.mk setup_native/Package_scripts.mk setup_native/Package_ulf.mk setup_native/Package_winto ols.mk shell/Package_scripts_gnome.mk shell/Package_scripts_kde.mk shell/Package_scripts.mk shell/Package_senddoc.mk solenv/gbuild solenv/Package_gdb.mk svx/Package_gengal.mk sysui/Package_desktop.mk sysui/Package_icons.mk sysui/Package_infoplist.mk sysui/Package_osxicons.mk sysui/Package_share.mk test/Package_unittest.mk unoil/Package_clioootypesversion.mk ure/Package_install.mk vcl/Package_osxres.mk wizards/Package_access2base.mk wizards/Package_depot.mk wizards/Package_euro.mk wizards/Package_form.mk wizards/Package_gimmicks.mk wizards/Package_import.mk wizards/Package_share.mk wizards/Package_standard.mk wizards/Package_template.mk wizards/Package_tools.mk wizards/Package_tutorials.mk wizards/Package_usr.mk xmlhelp/Package_helpxsl.mk xmloff/Package_dtd.mk xmlscript/Package_dtd.mk
Michael Stahl
mstahl at redhat.com
Mon Oct 28 12:23:18 PDT 2013
bridges/Package_jnilib_java_uno.mk | 2
cli_ure/Package_cli_basetypes_copy.mk | 2
cli_ure/Package_version.mk | 2
connectivity/Package_postgresql-sdbc.mk | 2
desktop/Package_branding.mk | 2
desktop/Package_branding_custom.mk | 2
desktop/Package_desktop_install.mk | 2
desktop/Package_scripts.mk | 2
desktop/Package_soffice_sh.mk | 2
extensions/Package_OOoSpotlightImporter.mk | 2
extensions/Package_mdibundle.mk | 2
external/afms/ExternalPackage_fontunxafm.mk | 2
external/apache-commons/ExternalPackage_apache_commons_logging.mk | 2
external/beanshell/ExternalPackage_beanshell.mk | 2
external/cairo/ExternalPackage_cairo.mk | 2
external/cairo/ExternalPackage_pixman.mk | 2
external/ct2n/ExternalPackage_ct2n.mk | 2
external/curl/ExternalPackage_curl.mk | 2
external/firebird/ExternalPackage_firebird.mk | 2
external/hsqldb/ExternalPackage_hsqldb.mk | 2
external/icu/ExternalPackage_icu.mk | 2
external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk | 2
external/jfreereport/ExternalPackage_jfreereport_flute.mk | 2
external/jfreereport/ExternalPackage_jfreereport_libbase.mk | 2
external/jfreereport/ExternalPackage_jfreereport_libfonts.mk | 2
external/jfreereport/ExternalPackage_jfreereport_libformula.mk | 2
external/jfreereport/ExternalPackage_jfreereport_liblayout.mk | 2
external/jfreereport/ExternalPackage_jfreereport_libloader.mk | 2
external/jfreereport/ExternalPackage_jfreereport_librepository.mk | 2
external/jfreereport/ExternalPackage_jfreereport_libserializer.mk | 2
external/jfreereport/ExternalPackage_jfreereport_libxml.mk | 2
external/jfreereport/ExternalPackage_jfreereport_sac.mk | 2
external/lcms2/ExternalPackage_lcms2.mk | 2
external/libexttextcat/ExternalPackage_fingerprint.mk | 2
external/liblangtag/ExternalPackage_langtag_data.mk | 2
external/liblangtag/ExternalPackage_liblangtag_data.mk | 2
external/libxml2/ExternalPackage_xml2.mk | 2
external/libxslt/ExternalPackage_xslt.mk | 2
external/lpsolve/ExternalPackage_lpsolve.mk | 2
external/mingw-externals/Package_jawt.mk | 2
external/mingw-externals/Package_mingw_dlls.mk | 2
external/mingw-externals/Package_mingw_gccdlls.mk | 2
external/more_fonts/ExternalPackage_caladea.mk | 2
external/more_fonts/ExternalPackage_carlito.mk | 2
external/more_fonts/ExternalPackage_dejavu.mk | 2
external/more_fonts/ExternalPackage_gentium.mk | 2
external/more_fonts/ExternalPackage_liberation.mk | 2
external/more_fonts/ExternalPackage_liberation_narrow.mk | 2
external/more_fonts/ExternalPackage_libertineg.mk | 2
external/more_fonts/ExternalPackage_opensans.mk | 2
external/more_fonts/ExternalPackage_ptserif.mk | 2
external/more_fonts/ExternalPackage_sourcecode.mk | 2
external/more_fonts/ExternalPackage_sourcesans.mk | 2
external/more_fonts/Package_conf.mk | 2
external/moz/ExternalPackage_moz_lib.mk | 2
external/moz/ExternalPackage_runtime.mk | 2
external/msc-externals/Package_dbghelp.mk | 2
external/msc-externals/Package_msms.mk | 2
external/msc-externals/Package_msvc80_dlls.mk | 2
external/msc-externals/Package_msvc_dlls.mk | 2
extras/ExternalPackage_accessoriesgallery.mk | 2
extras/ExternalPackage_accessoriesgallerydrawspeople.mk | 2
extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk | 2
extras/ExternalPackage_accessoriesgallerynonfree.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk | 2
extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk | 2
extras/ExternalPackage_accessoriesgalleryphotoscities.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosfauna.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosflowers.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk | 2
extras/ExternalPackage_accessoriesgalleryphotoshumans.mk | 2
extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosobjects.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosplants.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosspace.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosstatues.mk | 2
extras/ExternalPackage_accessoriesgalleryphotostravel.mk | 2
extras/ExternalPackage_accessoriestemplatescommon.mk | 2
extras/ExternalPackage_accessoriestemplatescommoneducate.mk | 2
extras/ExternalPackage_accessoriestemplatescommonfinance.mk | 2
extras/ExternalPackage_accessoriestemplatescommonforms.mk | 2
extras/ExternalPackage_accessoriestemplatescommonlabels.mk | 2
extras/ExternalPackage_accessoriestemplatescommonlayout.mk | 2
extras/ExternalPackage_accessoriestemplatescommonmisc.mk | 2
extras/ExternalPackage_accessoriestemplatescommonofficorr.mk | 2
extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk | 2
extras/ExternalPackage_accessoriestemplatescommonpersonal.mk | 2
extras/ExternalPackage_accessoriestemplatescommonpresent.mk | 2
extras/ExternalPackage_extra_fonts.mk | 2
extras/Package_autocorr.mk | 2
extras/Package_autotextuser.mk | 2
extras/Package_cfgsrvbitmapunx.mk | 2
extras/Package_cfgsrvnolang.mk | 2
extras/Package_cfgusr.mk | 2
extras/Package_database.mk | 2
extras/Package_databasebiblio.mk | 2
extras/Package_extensions.mk | 2
extras/Package_fonts.mk | 2
extras/Package_gallbullets.mk | 2
extras/Package_gallhtmlexpo.mk | 2
extras/Package_gallmytheme.mk | 2
extras/Package_gallroot.mk | 2
extras/Package_gallsystem.mk | 2
extras/Package_gallwwwback.mk | 2
extras/Package_gallwwwgraf.mk | 2
extras/Package_glade.mk | 2
extras/Package_labels.mk | 2
extras/Package_newfiles.mk | 2
extras/Package_palettes.mk | 2
extras/Package_tpllayoutimpr.mk | 2
extras/Package_tplwizagenda.mk | 2
extras/Package_tplwizbitmap.mk | 2
extras/Package_tplwizdesktop.mk | 2
extras/Package_tplwizfax.mk | 2
extras/Package_tplwizletter.mk | 2
extras/Package_tplwizreport.mk | 2
extras/Package_tplwizstyles.mk | 2
extras/Package_wordbook.mk | 4 -
filter/Package_docbook.mk | 2
filter/Package_xhtml.mk | 2
filter/Package_xslt.mk | 2
framework/Package_dtd.mk | 2
instsetoo_native/Package_setup.mk | 2
jvmfwk/Module_jvmfwk.mk | 2
jvmfwk/Package_jreproperties.mk | 2
jvmfwk/Package_jreproperties_solver.mk | 20 -----
jvmfwk/Package_rcfiles.mk | 10 --
jvmfwk/Package_rcfiles_solver.mk | 35 ----------
l10ntools/Package_ulfconv.mk | 2
languagetool/Package_languagetool.mk | 2
librelogo/Package_librelogo.mk | 2
librelogo/Package_librelogo_properties.mk | 2
libxmlsec/ExternalPackage_xmlsec.mk | 2
nss/ExternalPackage_nss.mk | 2
officecfg/Package_misc.mk | 2
openssl/ExternalPackage_openssl.mk | 2
package/Package_dtd.mk | 2
padmin/Package_padmin.mk | 2
postprocess/Package_images.mk | 2
postprocess/Package_registry.mk | 2
psprint_config/Package_fontunxppds.mk | 2
psprint_config/Package_fontunxpsprint.mk | 2
python3/ExternalPackage_python3.mk | 2
pyuno/Package_python_scripts.mk | 2
pyuno/Package_python_shell.mk | 2
pyuno/Package_zipcore.mk | 2
readlicense_oo/Package_files.mk | 2
readlicense_oo/Package_license.mk | 2
readlicense_oo/Package_readme.mk | 2
redland/ExternalPackage_raptor.mk | 2
redland/ExternalPackage_rasqal.mk | 2
redland/ExternalPackage_redland.mk | 2
reportbuilder/Package_reportbuilder-templates.mk | 2
rhino/ExternalPackage_rhino.mk | 2
scripting/Package_ScriptsBeanShell.mk | 2
scripting/Package_ScriptsJavaScript.mk | 2
scripting/Package_ScriptsPython.mk | 2
scripting/Package_java.mk | 2
scripting/Package_java_jars.mk | 2
scripting/Package_scriptbindinglib.mk | 2
scripting/Package_scriptproviderforpython.mk | 2
sd/Package_opengl.mk | 2
sd/Package_web.mk | 2
sd/Package_xml.mk | 2
sdext/Package_pdfimport_xpdfimport.mk | 4 -
setup_native/Package_misc.mk | 2
setup_native/Package_packinfo.mk | 2
setup_native/Package_scripts.mk | 2
setup_native/Package_scripts_generated.mk | 2
setup_native/Package_ulf.mk | 2
setup_native/Package_wintools.mk | 2
shell/Package_scripts.mk | 2
shell/Package_scripts_gnome.mk | 2
shell/Package_scripts_kde.mk | 2
shell/Package_senddoc.mk | 2
solenv/Package_gdb.mk | 2
solenv/gbuild/AllLangPackage.mk | 1
solenv/gbuild/Dictionary.mk | 2
solenv/gbuild/Gallery.mk | 2
solenv/gbuild/HelpTarget.mk | 1
solenv/gbuild/Library.mk | 1
solenv/gbuild/Package.mk | 12 ---
solenv/gbuild/Pyuno.mk | 1
solenv/gbuild/UIConfig.mk | 3
solenv/gbuild/UnoApi.mk | 1
svx/Package_gengal.mk | 3
sysui/Package_desktop.mk | 2
sysui/Package_icons.mk | 2
sysui/Package_infoplist.mk | 2
sysui/Package_osxicons.mk | 2
sysui/Package_share.mk | 2
test/Package_unittest.mk | 2
unoil/Package_clioootypesversion.mk | 2
ure/Package_install.mk | 2
vcl/Package_osxres.mk | 2
wizards/Package_access2base.mk | 2
wizards/Package_depot.mk | 2
wizards/Package_euro.mk | 2
wizards/Package_form.mk | 2
wizards/Package_gimmicks.mk | 2
wizards/Package_import.mk | 2
wizards/Package_share.mk | 2
wizards/Package_standard.mk | 2
wizards/Package_template.mk | 2
wizards/Package_tools.mk | 2
wizards/Package_tutorials.mk | 2
wizards/Package_usr.mk | 2
xmlhelp/Package_helpxsl.mk | 2
xmloff/Package_dtd.mk | 2
xmlscript/Package_dtd.mk | 2
210 files changed, 61 insertions(+), 429 deletions(-)
New commits:
commit bf0e30f9cdee963d3cf889305c85b53c21b8c974
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Oct 28 19:52:45 2013 +0100
jvmfwk: remove Package_*solver
Change-Id: I5784f3c060680c366053334db8a879250bfdbbbe
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index e5caeba..00fd9c5 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -16,9 +16,7 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\
Library_jvmfwk \
Library_sunjavaplugin \
Package_jreproperties \
- Package_jreproperties_solver \
Package_rcfiles \
- Package_rcfiles_solver \
))
ifneq (,$(filter-out MACOSX WNT,$(OS)))
diff --git a/jvmfwk/Package_jreproperties_solver.mk b/jvmfwk/Package_jreproperties_solver.mk
deleted file mode 100644
index 1a9b49b..0000000
--- a/jvmfwk/Package_jreproperties_solver.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-ifeq ($(OS),WNT)
-jvmfwk_Package_jreproperties_solver_LIBDIR := bin
-else
-jvmfwk_Package_jreproperties_solver_LIBDIR := lib
-endif
-
-$(eval $(call gb_Package_Package,jvmfwk_jreproperties_solver,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
-
-$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties_solver,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,jvmfwk_jreproperties_solver,$(jvmfwk_Package_jreproperties_solver_LIBDIR)/JREProperties.class,JREProperties.class))
-
-# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_rcfiles_solver.mk b/jvmfwk/Package_rcfiles_solver.mk
deleted file mode 100644
index 6fc4a09..0000000
--- a/jvmfwk/Package_rcfiles_solver.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-ifeq ($(OS),WNT)
-jvmfwk_Package_rcfiles_solver_LIBDIR := bin
-else
-jvmfwk_Package_rcfiles_solver_LIBDIR := lib
-endif
-
-$(eval $(call gb_Package_Package,jvmfwk_rcfiles_solver,$(SRCDIR)/jvmfwk))
-
-$(eval $(call gb_Package_set_outdir,jvmfwk_rcfiles_solver,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,jvmfwk3),source/jvmfwk3rc))
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc))
-
-ifeq ($(OS),AIX)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
-else ifeq ($(OS),FREEBSD)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml))
-else ifeq ($(OS),LINUX)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
-else ifeq ($(OS),MACOSX)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml))
-else ifeq ($(OS),WNT)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml))
-else
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml))
-endif
-
-# vim:set noet sw=4 ts=4:
commit 124f5e71d3d573c0459b41ce0b93cd22f6ed4c2c
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Oct 28 19:49:12 2013 +0100
gbuild: remove internal calls to gb_Package_set_outdir with INSTROOT
Change-Id: If8aded13ed91a871b119192401d2c2edbbd50f94
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk
index e8a2a19..cc8c0b8 100644
--- a/solenv/gbuild/AllLangPackage.mk
+++ b/solenv/gbuild/AllLangPackage.mk
@@ -44,7 +44,6 @@ 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),$(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/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 1803bf4..651d5ae9 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -213,8 +213,6 @@ $(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)),$(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/Gallery.mk b/solenv/gbuild/Gallery.mk
index 0a9336c..bc60a3b 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -109,7 +109,6 @@ $(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)),$(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)))
@@ -124,7 +123,6 @@ 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),$(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 da9e5af..d3ae728 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -594,7 +594,6 @@ $(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),$(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/Library.mk b/solenv/gbuild/Library.mk
index dd42286..860b890 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -74,7 +74,6 @@ 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),$(INSTROOT))
$(call gb_Package_add_file,Library_Copy_$(1),$(2),$(2))
$(OUTDIR)/lib/$(notdir $(2)) : $(INSTROOT)/$(2)
endef
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index a4d3104..25f8c8f 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -33,7 +33,6 @@ 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)),$(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/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index e2c1767..0f1ee1a 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -209,8 +209,6 @@ $(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)),$(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 +228,6 @@ 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)),$(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 69ae8a9..5f40ee3 100644
--- a/solenv/gbuild/UnoApi.mk
+++ b/solenv/gbuild/UnoApi.mk
@@ -20,7 +20,6 @@ $(call gb_UnoApiTarget_UnoApiTarget,$(1),$(1))
$(call gb_UnoApiHeadersTarget_UnoApiHeadersTarget,$(1))
ifneq ($(gb_UnoApi_ENABLE_INSTALL),)
$(call gb_Package_Package_internal,$(1)_idl,$(SRCDIR))
-$(call gb_Package_set_outdir,$(1)_idl,$(INSTDIR))
endif
$(call gb_UnoApi_get_target,$(1)) :| $(dir $(call gb_UnoApi_get_target,$(1))).dir
commit 8df17a34095dce7db16d9d2e505043f806704f66
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Oct 28 19:30:11 2013 +0100
gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
diff --git a/bridges/Package_jnilib_java_uno.mk b/bridges/Package_jnilib_java_uno.mk
index 918acd9..446613f 100644
--- a/bridges/Package_jnilib_java_uno.mk
+++ b/bridges/Package_jnilib_java_uno.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,bridges_jnilib_java_uno,$(SRCDIR)))
-$(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))))
# vim: set noet sw=4 ts=4:
diff --git a/cli_ure/Package_cli_basetypes_copy.mk b/cli_ure/Package_cli_basetypes_copy.mk
index 8cb20ce..75abab1 100644
--- a/cli_ure/Package_cli_basetypes_copy.mk
+++ b/cli_ure/Package_cli_basetypes_copy.mk
@@ -10,8 +10,6 @@
$(eval $(call gb_Package_Package,cli_basetypes_copy,$(INSTROOT)))
-$(eval $(call gb_Package_set_outdir,cli_basetypes_copy,$(INSTDIR)))
-
# duplicate copy to work around CLR DLL finding brain damage
$(eval $(call gb_Package_add_files,cli_basetypes_copy,$(SDKDIRNAME)/bin,\
$(LIBO_URE_LIB_FOLDER)/cli_basetypes.dll \
diff --git a/cli_ure/Package_version.mk b/cli_ure/Package_version.mk
index 6ab670e..675d32a 100644
--- a/cli_ure/Package_version.mk
+++ b/cli_ure/Package_version.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,cli_ure_version,$(SRCDIR)/cli_ure/version))
+$(eval $(call gb_Package_set_outdir,cli_ure_version,$(OUTDIR)))
+
$(eval $(call gb_Package_add_file,cli_ure_version,bin/cliureversion.mk,version.txt))
# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Package_postgresql-sdbc.mk b/connectivity/Package_postgresql-sdbc.mk
index c4f1d24..2820fc4 100644
--- a/connectivity/Package_postgresql-sdbc.mk
+++ b/connectivity/Package_postgresql-sdbc.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,connectivity_postgresql-sdbc,$(SRCDIR)/connectivity/source/drivers/postgresql))
-$(eval $(call gb_Package_set_outdir,connectivity_postgresql-sdbc,$(INSTROOT)))
-
$(eval $(call gb_Package_add_file,connectivity_postgresql-sdbc,$(LIBO_BIN_FOLDER)/postgresql-sdbc.ini,postgresql-sdbc.ini))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
index a7f9bc0..4cd39c8 100644
--- a/desktop/Package_branding.mk
+++ b/desktop/Package_branding.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
-$(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)),\
$(if $(filter intro.png,$(image)),\
diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk
index 456d545..c2b6181 100644
--- a/desktop/Package_branding_custom.mk
+++ b/desktop/Package_branding_custom.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR)))
-$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,desktop_branding_custom,$(LIBO_ETC_FOLDER),\
$(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \
))
diff --git a/desktop/Package_desktop_install.mk b/desktop/Package_desktop_install.mk
index ad7a74c..00d7546 100644
--- a/desktop/Package_desktop_install.mk
+++ b/desktop/Package_desktop_install.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,desktop_install,$(SRCDIR)))
-$(eval $(call gb_Package_set_outdir,desktop_install,$(INSTROOT)))
-
$(eval $(call gb_Package_add_symbolic_link,desktop_install,program,MacOS))
# vim: set noet sw=4 ts=4:
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 046ba69..4ed94ad 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts))
-$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT)))
-
ifeq (,$(filter MACOSX WNT,$(OS)))
$(eval $(call gb_Package_add_file,desktop_scripts_install,$(LIBO_BIN_FOLDER)/gdbtrace,gdbtrace))
diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
index c0aadbd..046c95f 100644
--- a/desktop/Package_soffice_sh.mk
+++ b/desktop/Package_soffice_sh.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice)))
-$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTROOT)))
-
$(eval $(call gb_Package_add_file,desktop_soffice_sh,$(LIBO_BIN_FOLDER)/soffice,soffice.sh))
# vim:set noet sw=4 ts=4:
diff --git a/extensions/Package_OOoSpotlightImporter.mk b/extensions/Package_OOoSpotlightImporter.mk
index 545af57..35cfa24 100644
--- a/extensions/Package_OOoSpotlightImporter.mk
+++ b/extensions/Package_OOoSpotlightImporter.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extensions_OOoSpotlightImporter,$(gb_Library_DLLDIR)))
-$(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)))
# vim: set noet sw=4 ts=4:
diff --git a/extensions/Package_mdibundle.mk b/extensions/Package_mdibundle.mk
index 6b81227..3677116 100644
--- a/extensions/Package_mdibundle.mk
+++ b/extensions/Package_mdibundle.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extensions_mdibundle,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter))
-$(eval $(call gb_Package_set_outdir,extensions_mdibundle,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents,\
Info.plist \
en.lproj/schema.strings \
diff --git a/external/afms/ExternalPackage_fontunxafm.mk b/external/afms/ExternalPackage_fontunxafm.mk
index 936b1af..97c7e48 100644
--- a/external/afms/ExternalPackage_fontunxafm.mk
+++ b/external/afms/ExternalPackage_fontunxafm.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,afms_fontunxafm,afms))
-$(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 \
Courier-BoldOblique.afm \
diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
index 6ee1933..5a37df2 100644
--- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_commons_logging))
-$(eval $(call gb_ExternalPackage_set_outdir,apache_commons_logging,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging))
$(eval $(call gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar))
diff --git a/external/beanshell/ExternalPackage_beanshell.mk b/external/beanshell/ExternalPackage_beanshell.mk
index 0cb34cd..f6e4ad1 100644
--- a/external/beanshell/ExternalPackage_beanshell.mk
+++ b/external/beanshell/ExternalPackage_beanshell.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell))
-$(eval $(call gb_ExternalPackage_set_outdir,beanshell,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell))
$(eval $(call gb_ExternalPackage_add_file,beanshell,$(LIBO_SHARE_JAVA_FOLDER)/bsh.jar,dist/bsh-2.0b1.jar))
diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk
index 34462f6..e40fc54 100644
--- a/external/cairo/ExternalPackage_cairo.mk
+++ b/external/cairo/ExternalPackage_cairo.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo))
-$(eval $(call gb_ExternalPackage_set_outdir,cairo,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk
index ee3bf11..ead0289 100644
--- a/external/cairo/ExternalPackage_pixman.mk
+++ b/external/cairo/ExternalPackage_pixman.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman))
-$(eval $(call gb_ExternalPackage_set_outdir,pixman,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
$(eval $(call gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
diff --git a/external/ct2n/ExternalPackage_ct2n.mk b/external/ct2n/ExternalPackage_ct2n.mk
index 599e433..ead604e 100644
--- a/external/ct2n/ExternalPackage_ct2n.mk
+++ b/external/ct2n/ExternalPackage_ct2n.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,ct2n,ConvertTextToNumber))
-$(eval $(call gb_ExternalPackage_set_outdir,ct2n,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,ct2n,share/extensions/ConvertTextToNumber,\
Addons.xcu \
CT2N/MainCode.xba \
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 89b8699..fa8b325 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,curl,curl))
-$(eval $(call gb_ExternalPackage_set_outdir,curl,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,curl,curl))
ifneq ($(DISABLE_DYNLOADING),TRUE)
diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk
index 882544c..0a14e41 100644
--- a/external/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,firebird,firebird))
-$(eval $(call gb_ExternalPackage_set_outdir,firebird,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/external/hsqldb/ExternalPackage_hsqldb.mk b/external/hsqldb/ExternalPackage_hsqldb.mk
index 3b7397a..e4dbb36 100644
--- a/external/hsqldb/ExternalPackage_hsqldb.mk
+++ b/external/hsqldb/ExternalPackage_hsqldb.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,hsqldb_project,hsqldb))
-$(eval $(call gb_ExternalPackage_set_outdir,hsqldb_project,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,hsqldb_project,hsqldb))
$(eval $(call gb_ExternalPackage_add_file,hsqldb_project,$(LIBO_SHARE_JAVA_FOLDER)/hsqldb.jar,lib/hsqldb.jar))
diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk
index 0ba76dc..be3a1d8 100644
--- a/external/icu/ExternalPackage_icu.mk
+++ b/external/icu/ExternalPackage_icu.mk
@@ -11,8 +11,6 @@ icu_VERSION := $(ICU_MAJOR).$(ICU_MINOR)$(if $(ICU_MICRO),.$(ICU_MICRO))
$(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu))
-$(eval $(call gb_ExternalPackage_set_outdir,icu,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,icu,icu))
ifneq ($(DISABLE_DYNLOADING),TRUE)
diff --git a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
index 3c93fce..9b1ecf6 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_flow_engine,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_flow_engine,$(LIBO_SHARE_JAVA_FOLDER)/flow-engine.jar,build/lib/flow-engine.jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_flute.mk b/external/jfreereport/ExternalPackage_jfreereport_flute.mk
index d97619c..bdc08a0 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_flute.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_flute.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_flute,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flute,jfreereport_flute))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_flute,$(LIBO_SHARE_JAVA_FOLDER)/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk
index eebb809..e3329d1 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_libbase.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_libbase.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libbase,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_libbase,$(LIBO_SHARE_JAVA_FOLDER)/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk
index edc3b78..910f15f 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_libfonts.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libfonts,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libfonts,jfreereport_libfonts))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_libfonts,$(LIBO_SHARE_JAVA_FOLDER)/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_libformula.mk b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk
index 790d5d2..8fb9ca9 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_libformula.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_libformula.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libformula,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libformula,jfreereport_libformula))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_libformula,$(LIBO_SHARE_JAVA_FOLDER)/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk
index 9588a89..0a5307c 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_liblayout.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_liblayout,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_liblayout,$(LIBO_SHARE_JAVA_FOLDER)/liblayout.jar,build/lib/liblayout.jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_libloader.mk b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk
index ee1c6f3..6cec115 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_libloader.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_libloader.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libloader,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libloader,jfreereport_libloader))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_libloader,$(LIBO_SHARE_JAVA_FOLDER)/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_librepository.mk b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk
index 2fc36d1..63662ad 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_librepository.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_librepository.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_librepository,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_librepository,jfreereport_librepository))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_librepository,$(LIBO_SHARE_JAVA_FOLDER)/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk
index 0eb9259..f12d688 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_libserializer.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libserializer,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libserializer,jfreereport_libserializer))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_libserializer,$(LIBO_SHARE_JAVA_FOLDER)/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_libxml.mk b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk
index 79b39d5..13c2078 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_libxml.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_libxml.mk
@@ -12,8 +12,6 @@ include $(SRCDIR)/external/jfreereport/version.mk
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_libxml,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libxml,jfreereport_libxml))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_libxml,$(LIBO_SHARE_JAVA_FOLDER)/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar))
diff --git a/external/jfreereport/ExternalPackage_jfreereport_sac.mk b/external/jfreereport/ExternalPackage_jfreereport_sac.mk
index ad27f11..cfdf31a 100644
--- a/external/jfreereport/ExternalPackage_jfreereport_sac.mk
+++ b/external/jfreereport/ExternalPackage_jfreereport_sac.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_sac,jfreereport_sac))
-$(eval $(call gb_ExternalPackage_set_outdir,jfreereport_sac,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_sac,jfreereport_sac))
$(eval $(call gb_ExternalPackage_add_file,jfreereport_sac,$(LIBO_SHARE_JAVA_FOLDER)/sac.jar,build/lib/sac.jar))
diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk
index 294347f..2785ea8 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2))
-$(eval $(call gb_ExternalPackage_set_outdir,lcms2,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2))
ifneq ($(DISABLE_DYNLOADING),TRUE)
diff --git a/external/libexttextcat/ExternalPackage_fingerprint.mk b/external/libexttextcat/ExternalPackage_fingerprint.mk
index 027d1ce..38bff25 100644
--- a/external/libexttextcat/ExternalPackage_fingerprint.mk
+++ b/external/libexttextcat/ExternalPackage_fingerprint.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libexttextcat_fingerprint,exttextcat))
-$(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 \
langclass/LM/ab.lm \
diff --git a/external/liblangtag/ExternalPackage_langtag_data.mk b/external/liblangtag/ExternalPackage_langtag_data.mk
index 3435e70..4c7973ad 100644
--- a/external/liblangtag/ExternalPackage_langtag_data.mk
+++ b/external/liblangtag/ExternalPackage_langtag_data.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,langtag_data,langtag))
+$(eval $(call gb_ExternalPackage_set_outdir,langtag_data,$(OUTDIR)))
+
$(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag,data/language-subtag-registry.xml))
$(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag/common/bcp47,\
data/common/bcp47/calendar.xml \
diff --git a/external/liblangtag/ExternalPackage_liblangtag_data.mk b/external/liblangtag/ExternalPackage_liblangtag_data.mk
index 0991d96..24375f2 100644
--- a/external/liblangtag/ExternalPackage_liblangtag_data.mk
+++ b/external/liblangtag/ExternalPackage_liblangtag_data.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,liblangtag_data,langtag))
-$(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/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk
index b60f3d0..0eb216f 100644
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ b/external/libxml2/ExternalPackage_xml2.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,xml2,xml2))
-$(eval $(call gb_ExternalPackage_set_outdir,xml2,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,xml2,xml2))
ifneq ($(DISABLE_DYNLOADING),TRUE)
diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk
index 6933e35..5e318c8 100644
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ b/external/libxslt/ExternalPackage_xslt.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,xslt,xslt))
-$(eval $(call gb_ExternalPackage_set_outdir,xslt,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,xslt,xslt))
ifneq ($(DISABLE_DYNLOADING),TRUE)
diff --git a/external/lpsolve/ExternalPackage_lpsolve.mk b/external/lpsolve/ExternalPackage_lpsolve.mk
index bd2715a..23c2c5a 100644
--- a/external/lpsolve/ExternalPackage_lpsolve.mk
+++ b/external/lpsolve/ExternalPackage_lpsolve.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
-$(eval $(call gb_ExternalPackage_set_outdir,lpsolve,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
ifneq ($(DISABLE_DYNLOADING),TRUE)
diff --git a/external/mingw-externals/Package_jawt.mk b/external/mingw-externals/Package_jawt.mk
index cc58cf9..bd2ed1a 100644
--- a/external/mingw-externals/Package_jawt.mk
+++ b/external/mingw-externals/Package_jawt.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,jawt,$(call gb_CustomTarget_get_workdir,external/jawt)))
+$(error FIXME do not deliver this stuff to OUTDIR)
+
$(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a))
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/mingw-externals/Package_mingw_dlls.mk b/external/mingw-externals/Package_mingw_dlls.mk
index c85032a..65a042d 100644
--- a/external/mingw-externals/Package_mingw_dlls.mk
+++ b/external/mingw-externals/Package_mingw_dlls.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin))
-$(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/mingw-externals/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk
index 521db37..d3f94d1 100644
--- a/external/mingw-externals/Package_mingw_gccdlls.mk
+++ b/external/mingw-externals/Package_mingw_gccdlls.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin))
+$(error FIXME do not deliver this stuff to OUTDIR)
+
$(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\
$(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \
$(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \
diff --git a/external/more_fonts/ExternalPackage_caladea.mk b/external/more_fonts/ExternalPackage_caladea.mk
index d26cb47..9632a9d 100644
--- a/external/more_fonts/ExternalPackage_caladea.mk
+++ b/external/more_fonts/ExternalPackage_caladea.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_caladea,font_caladea))
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_caladea,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_caladea,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
Caladea-Italic.ttf \
Caladea-Regular.ttf \
diff --git a/external/more_fonts/ExternalPackage_carlito.mk b/external/more_fonts/ExternalPackage_carlito.mk
index d110161..1e09a55 100644
--- a/external/more_fonts/ExternalPackage_carlito.mk
+++ b/external/more_fonts/ExternalPackage_carlito.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_carlito,font_carlito))
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_carlito,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_carlito,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
Carlito-BoldItalic.ttf \
Carlito-Regular.ttf \
diff --git a/external/more_fonts/ExternalPackage_dejavu.mk b/external/more_fonts/ExternalPackage_dejavu.mk
index d307041..22e7f6c 100644
--- a/external/more_fonts/ExternalPackage_dejavu.mk
+++ b/external/more_fonts/ExternalPackage_dejavu.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu))
-$(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 \
ttf/DejaVuSans-BoldOblique.ttf \
diff --git a/external/more_fonts/ExternalPackage_gentium.mk b/external/more_fonts/ExternalPackage_gentium.mk
index 2099d66..aa84627 100644
--- a/external/more_fonts/ExternalPackage_gentium.mk
+++ b/external/more_fonts/ExternalPackage_gentium.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium))
-$(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 \
GenBasBI.ttf \
diff --git a/external/more_fonts/ExternalPackage_liberation.mk b/external/more_fonts/ExternalPackage_liberation.mk
index b3a43c8..a572074 100644
--- a/external/more_fonts/ExternalPackage_liberation.mk
+++ b/external/more_fonts/ExternalPackage_liberation.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation))
-$(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 \
LiberationMono-BoldItalic.ttf \
diff --git a/external/more_fonts/ExternalPackage_liberation_narrow.mk b/external/more_fonts/ExternalPackage_liberation_narrow.mk
index 93af73a..2fc52f3 100644
--- a/external/more_fonts/ExternalPackage_liberation_narrow.mk
+++ b/external/more_fonts/ExternalPackage_liberation_narrow.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow))
-$(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 \
LiberationSansNarrow-BoldItalic.ttf \
diff --git a/external/more_fonts/ExternalPackage_libertineg.mk b/external/more_fonts/ExternalPackage_libertineg.mk
index 4e08aa2..9c97b3b 100644
--- a/external/more_fonts/ExternalPackage_libertineg.mk
+++ b/external/more_fonts/ExternalPackage_libertineg.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg))
-$(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 \
LinBiolinum_RI_G.ttf \
diff --git a/external/more_fonts/ExternalPackage_opensans.mk b/external/more_fonts/ExternalPackage_opensans.mk
index 53be593..adbf923 100644
--- a/external/more_fonts/ExternalPackage_opensans.mk
+++ b/external/more_fonts/ExternalPackage_opensans.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans))
-$(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 \
OpenSans-Bold.ttf \
diff --git a/external/more_fonts/ExternalPackage_ptserif.mk b/external/more_fonts/ExternalPackage_ptserif.mk
index c9f0c98..41dedfc 100644
--- a/external/more_fonts/ExternalPackage_ptserif.mk
+++ b/external/more_fonts/ExternalPackage_ptserif.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif))
-$(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 \
PT_Serif-Web-Bold.ttf \
diff --git a/external/more_fonts/ExternalPackage_sourcecode.mk b/external/more_fonts/ExternalPackage_sourcecode.mk
index 416d44e..6160e56 100644
--- a/external/more_fonts/ExternalPackage_sourcecode.mk
+++ b/external/more_fonts/ExternalPackage_sourcecode.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode))
-$(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 \
SourceCodePro-Regular.ttf \
diff --git a/external/more_fonts/ExternalPackage_sourcesans.mk b/external/more_fonts/ExternalPackage_sourcesans.mk
index bf6d315..45f21d6 100644
--- a/external/more_fonts/ExternalPackage_sourcesans.mk
+++ b/external/more_fonts/ExternalPackage_sourcesans.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans))
-$(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 \
SourceSansPro-Bold.ttf \
diff --git a/external/more_fonts/Package_conf.mk b/external/more_fonts/Package_conf.mk
index 43b9843..2d259c2 100644
--- a/external/more_fonts/Package_conf.mk
+++ b/external/more_fonts/Package_conf.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/external/more_fonts/fonts))
-$(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))
# vim: set noet sw=4 ts=4:
diff --git a/external/moz/ExternalPackage_moz_lib.mk b/external/moz/ExternalPackage_moz_lib.mk
index 6246b21..5d21127 100644
--- a/external/moz/ExternalPackage_moz_lib.mk
+++ b/external/moz/ExternalPackage_moz_lib.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,moz_lib,moz_lib))
+$(eval $(call gb_ExternalPackage_set_outdir,moz_lib,$(OUTDIR)))
+
$(eval $(call gb_ExternalPackage_add_unpacked_files,moz_lib,lib,\
nslber32v50.lib \
nsldap32v50.lib \
diff --git a/external/moz/ExternalPackage_runtime.mk b/external/moz/ExternalPackage_runtime.mk
index ca1cb11..d141f83 100644
--- a/external/moz/ExternalPackage_runtime.mk
+++ b/external/moz/ExternalPackage_runtime.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,moz_runtime,mozruntime))
-$(eval $(call gb_ExternalPackage_set_outdir,moz_runtime,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,moz_runtime,$(LIBO_BIN_FOLDER),\
components/addrbook.dll \
components/addrbook.xpt \
diff --git a/external/msc-externals/Package_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk
index 4387839..f6f684a 100644
--- a/external/msc-externals/Package_dbghelp.mk
+++ b/external/msc-externals/Package_dbghelp.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,dbghelp,$(TARFILE_LOCATION)))
+$(eval $(call gb_Package_set_outdir,dbghelp,$(OUTDIR)))
+
$(eval $(call gb_Package_add_file,dbghelp,bin/dbghelp.dll,$(DBGHELP_DLL)))
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/msc-externals/Package_msms.mk b/external/msc-externals/Package_msms.mk
index 283e113..9ffa294 100644
--- a/external/msc-externals/Package_msms.mk
+++ b/external/msc-externals/Package_msms.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,msms,$(MSM_PATH)))
+$(eval $(call gb_Package_set_outdir,msms,$(OUTDIR)))
+
$(eval $(call gb_Package_add_files,msms,bin,\
$(MERGE_MODULES) \
))
diff --git a/external/msc-externals/Package_msvc80_dlls.mk b/external/msc-externals/Package_msvc80_dlls.mk
index 5e51080..0a2feed 100644
--- a/external/msc-externals/Package_msvc80_dlls.mk
+++ b/external/msc-externals/Package_msvc80_dlls.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,msvc80_dlls,$(MSVC80_DLL_PATH)))
+$(eval $(call gb_Package_set_outdir,msvc80_dlls,$(OUTDIR)))
+
$(eval $(call gb_Package_add_files,msvc80_dlls,bin,\
$(MSVC80_DLLS) \
))
diff --git a/external/msc-externals/Package_msvc_dlls.mk b/external/msc-externals/Package_msvc_dlls.mk
index dd68f10..d82dd06 100644
--- a/external/msc-externals/Package_msvc_dlls.mk
+++ b/external/msc-externals/Package_msvc_dlls.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH)))
-$(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 efa6c70..253661c 100644
--- a/extras/ExternalPackage_accessoriesgallery.mk
+++ b/extras/ExternalPackage_accessoriesgallery.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallery,gallery-pack))
-$(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 \
accessories/sg1010.sdv \
diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
index 1961f4c..fda7c76 100644
--- a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
+++ b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
@@ -10,8 +10,6 @@
#$(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,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\
accessories/Draws/People/Baboo1.png \
accessories/Draws/People/Jac1.png \
diff --git a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
index 8a81b56..8e5e49d 100644
--- a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
+++ b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelementsbullets2,gallery-pack))
-$(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 \
accessories/Elements/Bullets2/amethyst.asterisk.png \
diff --git a/extras/ExternalPackage_accessoriesgallerynonfree.mk b/extras/ExternalPackage_accessoriesgallerynonfree.mk
index ea5d872..3a7e37b 100644
--- a/extras/ExternalPackage_accessoriesgallerynonfree.mk
+++ b/extras/ExternalPackage_accessoriesgallerynonfree.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerynonfree,gallery-pack))
-$(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 \
accessories-nonfree/sg600.sdv \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
index 72c265c..01f405f 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosbuildings,gallery-pack))
-$(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 \
accessories/Photos/Buildings/ArkSoft0408010023.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
index 6af42c3..41e0eed 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscelebration,gallery-pack))
-$(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 \
accessories/Photos/Celebration/JS_PDPhO_new_years_fireworks_explosion.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
index 82dc8cc..a7f5cd7 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscities,gallery-pack))
-$(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 \
accessories/Photos/Cities/ArkSoft0507170041.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
index 8bf04c0..cad78c3 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfauna,gallery-pack))
-$(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 \
accessories/Photos/Fauna/bee_on_citrus.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
index 9cfbae6..19da063 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosflowers,gallery-pack))
-$(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 \
accessories/Photos/Flowers/1482010374_31c0e4c1ed_o.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
index 7398ddb..fc0bc22 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosfoodsanddrinks,gallery-pack))
-$(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 \
accessories/Photos/FoodsandDrinks/JS_PDPhO_fish_and_chips.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
index 58215c8..32ad66e 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoshumans,gallery-pack))
-$(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 \
accessories/Photos/Humans/1472456323_62f1a7dad1_o.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
index 0f8fd55..4fe487a 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoslandscapes,gallery-pack))
-$(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 \
accessories/Photos/Landscapes/ArkSoft0405010019.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
index ee731b3..fbb7346 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosobjects,gallery-pack))
-$(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 \
accessories/Photos/Objects/morguefiles_com_pindiyath100_111064504847.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
index 5cf1e84..8b2cd6b 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosplants,gallery-pack))
-$(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 \
accessories/Photos/Plants/ArkSoft0405020019.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
index ad0ff11..2162831 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosspace,gallery-pack))
-$(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 \
accessories/Photos/Space/Wikimedia_Space_1995-18-b-large_web.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
index 6be90e0..d100d1d 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosstatues,gallery-pack))
-$(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 \
accessories/Photos/Statues/ArkSoft0507170032.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
index 0b0aac6..63265c3 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotostravel,gallery-pack))
-$(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 \
accessories/Photos/Travel/JS_PDPhO_cruise_ship.jpg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommon.mk b/extras/ExternalPackage_accessoriestemplatescommon.mk
index bdc80af..975520a 100644
--- a/extras/ExternalPackage_accessoriestemplatescommon.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommon.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommon,templates-pack))
-$(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 \
templates/common/svn-commit.2.tmp \
diff --git a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
index de8a553..771db9a 100644
--- a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommoneducate,templates-pack))
-$(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 \
templates/common/educate/A4-lin_2mm.otg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
index e800878..343061b 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonfinance,templates-pack))
-$(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 139820d..0bcfae6 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonforms.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonforms.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonforms,templates-pack))
-$(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 d5bf926..a16b048 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlabels,templates-pack))
-$(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 \
templates/common/labels/arrows-black-base.ott \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
index 9e19b4b..c1de672 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonlayout,templates-pack))
-$(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 \
templates/common/layout/abstract-015_1.jpg.otp \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
index 3b548d9..769da4a 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonmisc,templates-pack))
-$(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 \
templates/common/misc/Yellow_Pad_Legal.ott \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
index 9cdbc3a..3e8518c 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonofficorr,templates-pack))
-$(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 09d5815..780c5ea 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonoffimisc,templates-pack))
-$(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 fcb2ca8..42a7b7d 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpersonal,templates-pack))
-$(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 732043f..51eba77 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescommonpresent,templates-pack))
-$(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 f82e560..9e7d5e8c 100644
--- a/extras/ExternalPackage_extra_fonts.mk
+++ b/extras/ExternalPackage_extra_fonts.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,extras_extra_fonts,fonts-pack))
-$(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack))
$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index d6d65dc..773f08b 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autotext)))
-$(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 \
acor_bg-BG.dat \
diff --git a/extras/Package_autotextuser.mk b/extras/Package_autotextuser.mk
index 64fd70d..054295d 100644
--- a/extras/Package_autotextuser.mk
+++ b/extras/Package_autotextuser.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/autotext))
-$(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 483617d..250b7c1 100644
--- a/extras/Package_cfgsrvbitmapunx.mk
+++ b/extras/Package_cfgsrvbitmapunx.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps))
-$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,$(LIBO_SHARE_FOLDER)/config,\
psetupl.xpm \
psetup.xpm \
diff --git a/extras/Package_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk
index 7e90279..b1cd16f 100644
--- a/extras/Package_cfgsrvnolang.mk
+++ b/extras/Package_cfgsrvnolang.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_cfgsrvnolang,$(SRCDIR)/extras/source/misc_config))
-$(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 \
wizard/form/styles/bgr.css \
diff --git a/extras/Package_cfgusr.mk b/extras/Package_cfgusr.mk
index 41685ac..ab318eb 100644
--- a/extras/Package_cfgusr.mk
+++ b/extras/Package_cfgusr.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_cfgusr,$(SRCDIR)/extras/source/misc_config))
-$(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 4d1c47e..357e214 100644
--- a/extras/Package_database.mk
+++ b/extras/Package_database.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_database,$(SRCDIR)/extras/source/database))
-$(eval $(call gb_Package_set_outdir,extras_database,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_database,$(LIBO_SHARE_PRESETS_FOLDER)/database,\
biblio.odb \
evolocal.odb \
diff --git a/extras/Package_databasebiblio.mk b/extras/Package_databasebiblio.mk
index 459aa25..e77d4b4 100644
--- a/extras/Package_databasebiblio.mk
+++ b/extras/Package_databasebiblio.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_databasebiblio,$(SRCDIR)/extras/source/database))
-$(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 \
biblio.dbt \
diff --git a/extras/Package_extensions.mk b/extras/Package_extensions.mk
index 39f0c8d..a88679e 100644
--- a/extras/Package_extensions.mk
+++ b/extras/Package_extensions.mk
@@ -11,6 +11,8 @@
# be delivered from somewhere, so why not from extras...
$(eval $(call gb_Package_Package,extras_extensions,$(TARFILE_LOCATION)))
+$(eval $(call gb_Package_set_outdir,extras_extensions,$(OUTDIR)))
+
ifneq ($(BARCODE_EXTENSION_PACK),)
$(eval $(call gb_Package_add_file,extras_extensions,bin/Barcode.oxt,$(BARCODE_EXTENSION_PACK)))
endif
diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk
index 3521012..952c828 100644
--- a/extras/Package_fonts.mk
+++ b/extras/Package_fonts.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras))
-$(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))
# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk
index 3044384c..296250c 100644
--- a/extras/Package_gallbullets.mk
+++ b/extras/Package_gallbullets.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
-$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_gallbullets,$(LIBO_SHARE_FOLDER)/gallery/bullets,\
blkpearl.gif \
bluarrow.gif \
diff --git a/extras/Package_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk
index 4dadefa..43587fa 100644
--- a/extras/Package_gallhtmlexpo.mk
+++ b/extras/Package_gallhtmlexpo.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
-$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,$(LIBO_SHARE_FOLDER)/gallery/htmlexpo,\
bludown.gif \
blufirs_.gif \
diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index 964a5bc..8814991 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gallery/gallery_mytheme))
-$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
sg30.sdv \
sg30.thm \
diff --git a/extras/Package_gallroot.mk b/extras/Package_gallroot.mk
index b0b2fb7..fe59ca5 100644
--- a/extras/Package_gallroot.mk
+++ b/extras/Package_gallroot.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery))
-$(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_gallroot,$(LIBO_SHARE_FOLDER)/gallery,\
apples.gif \
bigapple.gif \
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 5a29baa..f8882d8 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
-$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
sg1.sdg \
sg1.sdv \
diff --git a/extras/Package_gallwwwback.mk b/extras/Package_gallwwwback.mk
index a989b11..f46a80c 100644
--- a/extras/Package_gallwwwback.mk
+++ b/extras/Package_gallwwwback.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gallery/www-back))
-$(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 \
bathroom.jpg \
diff --git a/extras/Package_gallwwwgraf.mk b/extras/Package_gallwwwgraf.mk
index 33725d4..0cb737b 100644
--- a/extras/Package_gallwwwgraf.mk
+++ b/extras/Package_gallwwwgraf.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf))
-$(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 \
bluback.gif \
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
index 2dbce19..1590550 100644
--- a/extras/Package_glade.mk
+++ b/extras/Package_glade.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade)))
-$(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))
# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_labels.mk b/extras/Package_labels.mk
index 66b6408..0b8613d 100644
--- a/extras/Package_labels.mk
+++ b/extras/Package_labels.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels))
-$(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))
# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_newfiles.mk b/extras/Package_newfiles.mk
index 7517c7b..157a17d 100644
--- a/extras/Package_newfiles.mk
+++ b/extras/Package_newfiles.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_newfiles,$(SRCDIR)/extras/source/shellnew))
-$(eval $(call gb_Package_set_outdir,extras_newfiles,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_newfiles,$(LIBO_SHARE_FOLDER)/template/shellnew,\
soffice.odg \
soffice.odp \
diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index f9aacba..bc317e2 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palettes))
-$(eval $(call gb_Package_set_outdir,extras_palettes,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_palettes,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
arrowhd.soe \
classic.sog \
diff --git a/extras/Package_tpllayoutimpr.mk b/extras/Package_tpllayoutimpr.mk
index 255ee1b..32c3bd5 100644
--- a/extras/Package_tpllayoutimpr.mk
+++ b/extras/Package_tpllayoutimpr.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_tpllayoutimpr,$(SRCDIR)/extras/source/templates/layout))
-$(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 \
AbstractRed.otp \
diff --git a/extras/Package_tplwizagenda.mk b/extras/Package_tplwizagenda.mk
index cbb8f4f..af0ab7e 100644
--- a/extras/Package_tplwizagenda.mk
+++ b/extras/Package_tplwizagenda.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_tplwizagenda,$(SRCDIR)/extras/source/templates/wizard/agenda))
-$(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 \
1simple.ott \
diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk
index e29068b..6fdc3cb 100644
--- a/extras/Package_tplwizbitmap.mk
+++ b/extras/Package_tplwizbitmap.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_tplwizbitmap,$(SRCDIR)/extras/source/templates/wizard/bitmap))
-$(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 \
cancel_up.bmp \
diff --git a/extras/Package_tplwizdesktop.mk b/extras/Package_tplwizdesktop.mk
index 1081f20..aafdf791 100644
--- a/extras/Package_tplwizdesktop.mk
+++ b/extras/Package_tplwizdesktop.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_tplwizdesktop,$(SRCDIR)/extras/source/templates/wizard/desktop))
-$(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 \
idxexample.odt \
diff --git a/extras/Package_tplwizfax.mk b/extras/Package_tplwizfax.mk
index be0e87a..6519c3c 100644
--- a/extras/Package_tplwizfax.mk
+++ b/extras/Package_tplwizfax.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_tplwizfax,$(SRCDIR)/extras/source/templates/wizard/fax))
-$(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 \
bus-classic-pri_f.ott \
diff --git a/extras/Package_tplwizletter.mk b/extras/Package_tplwizletter.mk
index 386800f..2829fef 100644
--- a/extras/Package_tplwizletter.mk
+++ b/extras/Package_tplwizletter.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_tplwizletter,$(SRCDIR)/extras/source/templates/wizard/letter))
-$(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 \
bus-modern_l.ott \
diff --git a/extras/Package_tplwizreport.mk b/extras/Package_tplwizreport.mk
index d7a2ee5..ec09a95 100644
--- a/extras/Package_tplwizreport.mk
+++ b/extras/Package_tplwizreport.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_tplwizreport,$(SRCDIR)/extras/source/templates/wizard/report))
-$(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 \
cnt-012.ott \
diff --git a/extras/Package_tplwizstyles.mk b/extras/Package_tplwizstyles.mk
index 9f8b64c..26d188f 100644
--- a/extras/Package_tplwizstyles.mk
+++ b/extras/Package_tplwizstyles.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_tplwizstyles,$(SRCDIR)/extras/source/templates/wizard/styles))
-$(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 \
black_white.ots \
diff --git a/extras/Package_wordbook.mk b/extras/Package_wordbook.mk
index d844e69..0923d0a 100644
--- a/extras/Package_wordbook.mk
+++ b/extras/Package_wordbook.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,extras_wordbook,$(SRCDIR)/extras/source/wordbook))
-$(eval $(call gb_Package_set_outdir,extras_wordbook,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,extras_wordbook,$(LIBO_SHARE_FOLDER)/wordbook,\
en-GB.dic \
en-US.dic \
diff --git a/filter/Package_docbook.mk b/filter/Package_docbook.mk
index aef359a..6548fd6 100644
--- a/filter/Package_docbook.mk
+++ b/filter/Package_docbook.mk
@@ -18,8 +18,6 @@
$(eval $(call gb_Package_Package,filter_docbook,$(SRCDIR)/filter/source/docbook))
-$(eval $(call gb_Package_set_outdir,filter_docbook,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,filter_docbook,$(LIBO_SHARE_FOLDER)/xslt/docbook,\
DocBookTemplate.stw \
docbooktosoffheadings.xsl \
diff --git a/filter/Package_xhtml.mk b/filter/Package_xhtml.mk
index fae4b03..91f9ff9 100644
--- a/filter/Package_xhtml.mk
+++ b/filter/Package_xhtml.mk
@@ -18,8 +18,6 @@
$(eval $(call gb_Package_Package,filter_xhtml,$(SRCDIR)/filter/source/xslt))
-$(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))
$(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl))
diff --git a/filter/Package_xslt.mk b/filter/Package_xslt.mk
index cedc3ba..314ff7a 100644
--- a/filter/Package_xslt.mk
+++ b/filter/Package_xslt.mk
@@ -18,8 +18,6 @@
$(eval $(call gb_Package_Package,filter_xslt,$(SRCDIR)/filter/source/xslt))
-$(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))
$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/measure_conversion.xsl,common/measure_conversion.xsl))
diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk
index 1f4a40d..50be165 100644
--- a/framework/Package_dtd.mk
+++ b/framework/Package_dtd.mk
@@ -19,8 +19,6 @@
$(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd))
-$(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 \
event.dtd \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 24ebae8..7201615 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -9,8 +9,6 @@
$(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,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,bootstrap) \
$(call gb_Helper_get_rcfile,fundamental) \
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
index 96f246c..ce113eb 100644
--- a/jvmfwk/Package_jreproperties.mk
+++ b/jvmfwk/Package_jreproperties.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
-$(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))
# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_jreproperties_solver.mk b/jvmfwk/Package_jreproperties_solver.mk
index 4cecdcc..1a9b49b 100644
--- a/jvmfwk/Package_jreproperties_solver.mk
+++ b/jvmfwk/Package_jreproperties_solver.mk
@@ -15,6 +15,8 @@ endif
$(eval $(call gb_Package_Package,jvmfwk_jreproperties_solver,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
+$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties_solver,$(OUTDIR)))
+
$(eval $(call gb_Package_add_file,jvmfwk_jreproperties_solver,$(jvmfwk_Package_jreproperties_solver_LIBDIR)/JREProperties.class,JREProperties.class))
# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk
index 124dcfd..4500404 100644
--- a/jvmfwk/Package_rcfiles.mk
+++ b/jvmfwk/Package_rcfiles.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk))
-$(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(INSTROOT)))
-
ifeq ($(OS),WNT)
$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml))
else ifeq ($(OS),FREEBSD)
diff --git a/jvmfwk/Package_rcfiles_solver.mk b/jvmfwk/Package_rcfiles_solver.mk
index 3571632..6fc4a09 100644
--- a/jvmfwk/Package_rcfiles_solver.mk
+++ b/jvmfwk/Package_rcfiles_solver.mk
@@ -15,6 +15,8 @@ endif
$(eval $(call gb_Package_Package,jvmfwk_rcfiles_solver,$(SRCDIR)/jvmfwk))
+$(eval $(call gb_Package_set_outdir,jvmfwk_rcfiles_solver,$(OUTDIR)))
+
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,jvmfwk3),source/jvmfwk3rc))
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc))
diff --git a/l10ntools/Package_ulfconv.mk b/l10ntools/Package_ulfconv.mk
index 41337b2..18be8b4 100644
--- a/l10ntools/Package_ulfconv.mk
+++ b/l10ntools/Package_ulfconv.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,l10ntools_ulfconv,$(SRCDIR)/l10ntools/source/ulfconv))
+$(eval $(call gb_Package_set_outdir,l10ntools_ulfconv,$(OUTDIR)))
+
$(eval $(call gb_Package_add_file,l10ntools_ulfconv,bin/msi-encodinglist.txt,msi-encodinglist.txt))
# vim: set noet sw=4 ts=4:
diff --git a/languagetool/Package_languagetool.mk b/languagetool/Package_languagetool.mk
index 1738c86..a40a1e4 100644
--- a/languagetool/Package_languagetool.mk
+++ b/languagetool/Package_languagetool.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,languagetool,$(call gb_UnpackedTarball_get_dir,languagetool)))
+$(eval $(call gb_Package_set_outdir,languagetool,$(OUTDIR)))
+
$(eval $(call gb_Package_use_external_project,languagetool,languagetool))
$(eval $(call gb_Package_add_file,languagetool,bin/LanguageTool.oxt,dist/LanguageTool.oxt))
diff --git a/librelogo/Package_librelogo.mk b/librelogo/Package_librelogo.mk
index bbb6d04..4747a44 100644
--- a/librelogo/Package_librelogo.mk
+++ b/librelogo/Package_librelogo.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,librelogo,$(SRCDIR)/librelogo/source))
-$(eval $(call gb_Package_set_outdir,librelogo,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,librelogo,$(LIBO_SHARE_FOLDER)/Scripts/python/LibreLogo,\
LibreLogo/LibreLogo.py \
pythonpath/LibreLogo_en_US.properties \
diff --git a/librelogo/Package_librelogo_properties.mk b/librelogo/Package_librelogo_properties.mk
index 902d3dc..9e809af 100644
--- a/librelogo/Package_librelogo_properties.mk
+++ b/librelogo/Package_librelogo_properties.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,librelogo_properties,$(call gb_CustomTarget_get_workdir,librelogo/locproperties)))
-$(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/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk
index c3c5170..06c7938 100644
--- a/libxmlsec/ExternalPackage_xmlsec.mk
+++ b/libxmlsec/ExternalPackage_xmlsec.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,xmlsec,xmlsec))
-$(eval $(call gb_ExternalPackage_set_outdir,xmlsec,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
ifeq ($(OS),WNT)
diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index 664f8ac..054c797 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,nss,nss))
-$(eval $(call gb_ExternalPackage_set_outdir,nss,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,nss,nss))
ifeq ($(OS),MACOSX)
diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk
index 651994f..bfe742c 100644
--- a/officecfg/Package_misc.mk
+++ b/officecfg/Package_misc.mk
@@ -19,8 +19,6 @@
$(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg))
-$(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/openssl/ExternalPackage_openssl.mk b/openssl/ExternalPackage_openssl.mk
index 37a2a73..695c7b7 100644
--- a/openssl/ExternalPackage_openssl.mk
+++ b/openssl/ExternalPackage_openssl.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,openssl,openssl))
-$(eval $(call gb_ExternalPackage_set_outdir,openssl,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl))
ifeq ($(COM),MSC)
diff --git a/package/Package_dtd.mk b/package/Package_dtd.mk
index 0adcad8..6897638 100644
--- a/package/Package_dtd.mk
+++ b/package/Package_dtd.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,package_dtd,$(SRCDIR)/package/dtd))
-$(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))
# vim: set noet sw=4 ts=4:
diff --git a/padmin/Package_padmin.mk b/padmin/Package_padmin.mk
index 1765776..e706f3f 100644
--- a/padmin/Package_padmin.mk
+++ b/padmin/Package_padmin.mk
@@ -19,8 +19,6 @@
$(eval $(call gb_Package_Package,padmin,$(SRCDIR)/padmin/source))
-$(eval $(call gb_Package_set_outdir,padmin,$(INSTROOT)))
-
$(eval $(call gb_Package_add_file,padmin,$(LIBO_BIN_FOLDER)/spadmin,spadmin.sh))
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
index 5a7c582..66fb0cd 100644
--- a/postprocess/Package_images.mk
+++ b/postprocess/Package_images.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images)))
-$(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) \
$(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \
diff --git a/postprocess/Package_registry.mk b/postprocess/Package_registry.mk
index 371ef8f..9bab645 100644
--- a/postprocess/Package_registry.mk
+++ b/postprocess/Package_registry.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,postprocess_registry,$(patsubst %/,%,$(call gb_XcdTarget_get_target,))))
-$(eval $(call gb_Package_set_outdir,postprocess_registry,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,postprocess_registry,$(LIBO_SHARE_FOLDER)/registry,\
$(postprocess_XCDS) \
$(foreach lang,$(gb_Configuration_LANGS), \
diff --git a/psprint_config/Package_fontunxppds.mk b/psprint_config/Package_fontunxppds.mk
index 744a1bb..781286f 100644
--- a/psprint_config/Package_fontunxppds.mk
+++ b/psprint_config/Package_fontunxppds.mk
@@ -18,8 +18,6 @@
$(eval $(call gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
-$(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 \
SGENT42.PS \
diff --git a/psprint_config/Package_fontunxpsprint.mk b/psprint_config/Package_fontunxpsprint.mk
index f52ea7d..ab0aaf7 100644
--- a/psprint_config/Package_fontunxpsprint.mk
+++ b/psprint_config/Package_fontunxpsprint.mk
@@ -18,8 +18,6 @@
$(eval $(call gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
-$(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 4fefb89..ac8e856 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,python3,python3))
-$(eval $(call gb_ExternalPackage_set_outdir,python3,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,python3,python3))
ifeq ($(OS)-$(COM),WNT-MSC)
diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk
index 0a76e02..80af459 100644
--- a/pyuno/Package_python_scripts.mk
+++ b/pyuno/Package_python_scripts.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,pyuno_python_scripts,$(SRCDIR)/pyuno/source))
-$(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 \
module/uno.py \
diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index 3f14841..e8c3fa6 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell)))
-$(eval $(call gb_Package_set_outdir,python_shell,$(INSTROOT)))
-
$(eval $(call gb_Package_add_file,python_shell,$(LIBO_BIN_FOLDER)/python,python.sh))
# vim: set noet sw=4 ts=4:
diff --git a/pyuno/Package_zipcore.mk b/pyuno/Package_zipcore.mk
index ad14792..c330291 100644
--- a/pyuno/Package_zipcore.mk
+++ b/pyuno/Package_zipcore.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,python_zipcore,$(call gb_CustomTarget_get_workdir,pyuno/zipcore)))
+$(error FIXME do not deliver this stuff to OUTDIR)
+
pyuno_PYTHON_ARCHIVE_NAME:=python-core-$(PYTHON_VERSION).zip
$(eval $(call gb_Package_add_file,python_zipcore,bin/$(pyuno_PYTHON_ARCHIVE_NAME),$(pyuno_PYTHON_ARCHIVE_NAME)))
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index ad35b59..19cf8fd 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo))
+$(eval $(call gb_Package_set_outdir,readlicense_oo_files,$(OUTDIR)))
+
# LICENSE (upper case) is copied without EOL conversion from license.txt
# license.txt is converted, prior to copy, see Package_license.mk
$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE,txt/license.txt))
diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index 9b460d9..877db23 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license)))
+$(eval $(call gb_Package_set_outdir,readlicense_oo_license,$(OUTDIR)))
+
$(eval $(call gb_Package_add_file,readlicense_oo_license,bin/osl/license.txt,license.txt))
# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_readme.mk b/readlicense_oo/Package_readme.mk
index d0e86dd..1e30ba3 100644
--- a/readlicense_oo/Package_readme.mk
+++ b/readlicense_oo/Package_readme.mk
@@ -9,6 +9,8 @@
$(eval $(call gb_Package_Package,readlicense_oo_readme_inc,$(call gb_CustomTarget_get_workdir,readlicense_oo/readme)))
+$(eval $(call gb_Package_set_outdir,readlicense_oo_readme_inc,$(OUTDIR)))
+
$(eval $(call gb_Package_add_files,readlicense_oo_readme_inc,bin/osl,\
$(foreach lang,en-US $(filter-out en-US,$(gb_WITH_LANG)),\
$(if $(filter-out WNT,$(OS)),README_$(lang),readme_$(lang).txt) \
diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk
index 53bcfe4..c355105 100644
--- a/redland/ExternalPackage_raptor.mk
+++ b/redland/ExternalPackage_raptor.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,raptor,raptor))
-$(eval $(call gb_ExternalPackage_set_outdir,raptor,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,raptor,raptor))
ifeq ($(OS),MACOSX)
diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk
index 043a8ae..85b47a1 100644
--- a/redland/ExternalPackage_rasqal.mk
+++ b/redland/ExternalPackage_rasqal.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,rasqal,rasqal))
-$(eval $(call gb_ExternalPackage_set_outdir,rasqal,$(INSTROOT)))
-
$(eval $(call gb_ExternalPackage_use_external_project,rasqal,rasqal))
ifeq ($(OS),MACOSX)
diff --git a/redland/ExternalPackage_redland.mk b/redland/ExternalPackage_redland.mk
index ee241fb..eb20b75 100644
--- a/redland/ExternalPackage_redland.mk
+++ b/redland/ExternalPackage_redland.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,redland,redland))
-$(eval $(call gb_ExternalPackage_set_outdir,redland,$(INSTROOT)))
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list