[Libreoffice-commits] core.git: setup_native/CustomTarget_mac.mk

[Peter Foley]

 setup_native/CustomTarget_mac.mk |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit e8f09adf5bdd415278b63a055c12dd0f33cd1ba2
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Wed Feb 13 17:13:31 2013 -0500

    fix setup_native localization for mac
    
    Change-Id: Ifcd3a96e1e0d53bb7dabb3e8cda1846ca2d262be

diff --git a/setup_native/CustomTarget_mac.mk b/setup_native/CustomTarget_mac.mk
index 2746dfc..57f92f8 100644
--- a/setup_native/CustomTarget_mac.mk
+++ b/setup_native/CustomTarget_mac.mk
@@ -13,13 +13,12 @@ $(eval $(call gb_CustomTarget_register_target,setup_native/mac,macinstall.ulf))
 
 #FIXME: generalize rule? ripped off from ScpMergeTarget
 ifneq ($(WITH_LANG),)
-$(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: mac_POFILES := $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po)
 $(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 $(mac_POFILES) > $${MERGEINPUT} && \
+	echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po) > $${MERGEINPUT} && \
 	$(call gb_Helper_abbreviate_dirs,\
-	$(call gb_Executable_get_command,ulfconv) -p setup_native -i $< -o $@ -m $${MERGEINPUT} -l all ) && \
+	$(call gb_Executable_get_command,ulfex) -p setup_native -i $< -o $@ -m $${MERGEINPUT} -l all ) && \
 	rm -rf $${MERGEINPUT}
 else
 $(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf: $(SRCDIR)/setup_native/source/mac/macinstall.ulf