summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/Library_sellangmsi.mk4
-rw-r--r--setup_native/Package_spell.mk4
-rw-r--r--setup_native/Package_ulf.mk2
-rw-r--r--setup_native/Package_wintools.mk4
4 files changed, 9 insertions, 5 deletions
diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk
index 8219e6d6ada1..8411acd8d2ad 100644
--- a/setup_native/Library_sellangmsi.mk
+++ b/setup_native/Library_sellangmsi.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Library_Library,sellangmsi))
+$(eval $(call gb_Library_use_packages,sellangmsi,\
+ setup_native_spell \
+))
+
$(eval $(call gb_Library_add_defs,sellangmsi,\
-U_DLL \
))
diff --git a/setup_native/Package_spell.mk b/setup_native/Package_spell.mk
index a951a2d0ce7e..ab612296e941 100644
--- a/setup_native/Package_spell.mk
+++ b/setup_native/Package_spell.mk
@@ -7,8 +7,8 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,spell,$(call gb_CustomTarget_get_workdir,setup_native/spell)))
+$(eval $(call gb_Package_Package,setup_native_spell,$(call gb_CustomTarget_get_workdir,setup_native/spell)))
-$(eval $(call gb_Package_add_file,spell,inc/spellchecker_selection.hxx,spellchecker_selection.hxx))
+$(eval $(call gb_Package_add_file,setup_native_spell,inc/spellchecker_selection.hxx,spellchecker_selection.hxx))
# vim: set noet sw=4 ts=4:
diff --git a/setup_native/Package_ulf.mk b/setup_native/Package_ulf.mk
index 89842b51637c..bbf19c533d0d 100644
--- a/setup_native/Package_ulf.mk
+++ b/setup_native/Package_ulf.mk
@@ -9,6 +9,6 @@
$(eval $(call gb_Package_Package,setup_native/ulf,$(SRCDIR)/setup_native/source))
-$(eval $(call gb_Package_add_file,setup_native/misc,bin/macinstall.ulf,mac/macinstall.ulf))
+$(eval $(call gb_Package_add_file,setup_native/ulf,bin/macinstall.ulf,mac/macinstall.ulf))
# vim: set noet sw=4 ts=4:
diff --git a/setup_native/Package_wintools.mk b/setup_native/Package_wintools.mk
index 422b9cf3bf2d..05bb20154cc5 100644
--- a/setup_native/Package_wintools.mk
+++ b/setup_native/Package_wintools.mk
@@ -7,9 +7,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,wintools,$(call gb_CustomTarget_get_workdir,setup_native/wintools)))
+$(eval $(call gb_Package_Package,setup_native_wintools,$(call gb_CustomTarget_get_workdir,setup_native/wintools)))
-$(eval $(call gb_Package_add_files,scripts,bin,\
+$(eval $(call gb_Package_add_files,setup_native_wintools,bin,\
mackcab.exe \
msidb.exe \
msiinfo.exe \