gbuild: set Package default target to INSTDIR

Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186

Author: Michael Stahl

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:

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 \

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:

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:

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

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

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:

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

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:

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:

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 \

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 \

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

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

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

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

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 \

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)

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)

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

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)

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

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

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

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

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

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

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

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

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

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

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

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)

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 \

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 \

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

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)

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)

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)

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:

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

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

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 \

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 \