instsetoo_native/CustomTarget_install.mk | 12 ++++++------ setup_native/CustomTarget_mac.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit c18e468125c32d8dca88c374d534cab1e9597d03 Author: Andras Timar <ati...@suse.com> Date: Tue Feb 26 10:08:32 2013 +0100 setup_native: fix localization Change-Id: I3a179076f7102958fd2d8f24af1288aa610835da diff --git a/setup_native/CustomTarget_mac.mk b/setup_native/CustomTarget_mac.mk index 57f92f8..d91c6bd 100644 --- a/setup_native/CustomTarget_mac.mk +++ b/setup_native/CustomTarget_mac.mk @@ -16,7 +16,7 @@ ifneq ($(WITH_LANG),) $(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: $(SRCDIR)/setup_native/source/mac/macinstall.ulf | $(call gb_Executable_get_runtime_dependencies,ulfex) $(call gb_Output_announce,$@,$(true),SUM,1) MERGEINPUT=`$(gb_MKTEMP)` && \ - echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po) > $${MERGEINPUT} && \ + echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/setup_native/source/mac.po) > $${MERGEINPUT} && \ $(call gb_Helper_abbreviate_dirs,\ $(call gb_Executable_get_command,ulfex) -p setup_native -i $< -o $@ -m $${MERGEINPUT} -l all ) && \ rm -rf $${MERGEINPUT} commit a5e5dc9c622b47d6454938936e7b65beb9f461b1 Author: Andras Timar <ati...@suse.com> Date: Tue Feb 26 10:06:36 2013 +0100 instsetoo_native: fix localization Change-Id: I8cb1baecb7034511b8dfcecefc58de2fb3f59061 diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 6c44b7c..8b55cad 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -35,15 +35,15 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-% chmod a+x $@ ifneq ($(WITH_LANG),) -$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.mlf: \ +$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \ $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf | \ $(call gb_Executable_get_runtime_dependencies,ulfex) $(call gb_Output_announce,$@,$(true),SUM,1) - MERGEINPUT=`$(gb_MKTEMP)` && \ - echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po) > $${MERGEINPUT} && \ - $(call gb_Helper_abbreviate_dirs,\ - $(call gb_Executable_get_command,ulfex) -p instsetoo_native -i $< -o $@ -m $${MERGEINPUT} -l all ) && \ - rm -rf $${MERGEINPUT} + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po) > $${MERGEINPUT} && \ + $(call gb_Helper_abbreviate_dirs,\ + $(call gb_Executable_get_command,ulfex) -p instsetoo_native -i $< -o $@ -m $${MERGEINPUT} -l all ) && \ + rm -rf $${MERGEINPUT} else $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \ $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits