diff options
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/Package_misc.mk | 2 | ||||
| -rw-r--r-- | setup_native/Package_packinfo.mk | 2 | ||||
| -rw-r--r-- | setup_native/Package_scripts.mk | 2 | ||||
| -rw-r--r-- | setup_native/Package_scripts_generated.mk | 2 | ||||
| -rw-r--r-- | setup_native/Package_ulf.mk | 2 | ||||
| -rw-r--r-- | setup_native/Package_wintools.mk | 2 |
6 files changed, 12 insertions, 0 deletions
diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk index 9262fc62974d..f7cfa5b24fa6 100644 --- a/setup_native/Package_misc.mk +++ b/setup_native/Package_misc.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native/misc,$(SRCDIR)/setup_native/source)) +$(eval $(call gb_Package_set_outdir,setup_native/misc,$(OUTDIR))) + $(eval $(call gb_Package_add_file,setup_native/misc,bin/Info.plist.langpack,mac/Info.plist.langpack)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/ooo3_installer.icns,mac/ooo3_installer.icns)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store,mac/ooo/DS_Store)) diff --git a/setup_native/Package_packinfo.mk b/setup_native/Package_packinfo.mk index d0678105508e..786049354dbe 100644 --- a/setup_native/Package_packinfo.mk +++ b/setup_native/Package_packinfo.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native/packinfo,$(SRCDIR)/setup_native/source/packinfo)) +$(eval $(call gb_Package_set_outdir,setup_native/packinfo,$(OUTDIR))) + $(eval $(call gb_Package_add_file,setup_native/packinfo,bin/solariscopyrightfile,solariscopyrightfile)) $(eval $(call gb_Package_add_file,setup_native/packinfo,bin/linuxcopyrightfile,linuxcopyrightfile)) $(eval $(call gb_Package_add_file,setup_native/packinfo,bin/libreoffice.pcp,libreoffice.pcp)) diff --git a/setup_native/Package_scripts.mk b/setup_native/Package_scripts.mk index db7c5bb7c329..e9447430500e 100644 --- a/setup_native/Package_scripts.mk +++ b/setup_native/Package_scripts.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native/scripts,$(SRCDIR)/setup_native/scripts)) +$(eval $(call gb_Package_set_outdir,setup_native/scripts,$(OUTDIR))) + $(eval $(call gb_Package_add_file,setup_native/scripts,bin/admin.pl,admin.pl)) $(eval $(call gb_Package_add_file,setup_native/scripts,bin/mac_install.script,mac_install.script)) $(eval $(call gb_Package_add_file,setup_native/scripts,bin/osx_install_languagepack.applescript,osx_install_languagepack.applescript)) diff --git a/setup_native/Package_scripts_generated.mk b/setup_native/Package_scripts_generated.mk index ed4e59a556c4..ef157310fc4b 100644 --- a/setup_native/Package_scripts_generated.mk +++ b/setup_native/Package_scripts_generated.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,scripts_generated,$(call gb_CustomTarget_get_workdir,setup_native/scripts))) +$(eval $(call gb_Package_set_outdir,scripts_generated,$(OUTDIR))) + ifeq ($(OS),SOLARIS) $(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/install,install)) $(eval $(call gb_Package_add_file,scripts_generated,bin/userscripts/uninstall,uninstall)) diff --git a/setup_native/Package_ulf.mk b/setup_native/Package_ulf.mk index f8aafabd5bfa..1f58bcabf86d 100644 --- a/setup_native/Package_ulf.mk +++ b/setup_native/Package_ulf.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native/ulf,$(call gb_CustomTarget_get_workdir,setup_native/mac))) +$(eval $(call gb_Package_set_outdir,setup_native/ulf,$(OUTDIR))) + $(eval $(call gb_Package_add_file,setup_native/ulf,bin/macinstall.ulf,macinstall.ulf)) # vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_wintools.mk b/setup_native/Package_wintools.mk index 1c9919843c7e..5d9662e192e2 100644 --- a/setup_native/Package_wintools.mk +++ b/setup_native/Package_wintools.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,setup_native_wintools,$(call gb_CustomTarget_get_workdir,setup_native/wintools))) +$(error FIXME do not deliver this stuff to OUTDIR) + $(eval $(call gb_Package_add_files,setup_native_wintools,bin,\ makecab.exe \ msidb.exe \ |