setup_native/Library_sellangmsi.mk | 4 ++++ setup_native/Package_spell.mk | 4 ++-- setup_native/Package_ulf.mk | 2 +- setup_native/Package_wintools.mk | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-)
New commits: commit da698e0b2aacd9a252966f4965422e129a353e75 Author: Matúš Kukan <[email protected]> Date: Wed Feb 27 18:53:29 2013 +0100 setup_native: add missing dependency on package Also correct some package names. They were quite random, I wonder if it was working and they are needed for something. Change-Id: I5080f1f7eda967b602b6fac667018e11aec5a521 diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk index 8219e6d..8411acd 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 a951a2d..ab61229 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 89842b5..bbf19c5 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 422b9cf..05bb201 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 \
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
