summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-07-16 14:54:04 +0200
committerMichael Stahl <mstahl@redhat.com>2013-07-16 16:54:59 +0200
commit85c7e212a26b24883b9a001b6529efeb80955809 (patch)
tree61e29807b75c37191d8ac53055ec4d62507bd0c2 /setup_native
parent2bbf5d5bcffd2218f6b48fdfa4965735cbd4dd68 (diff)
gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule
Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/CustomTarget_mac.mk18
1 files changed, 5 insertions, 13 deletions
diff --git a/setup_native/CustomTarget_mac.mk b/setup_native/CustomTarget_mac.mk
index d3b171b6716e..2f35f23ccef1 100644
--- a/setup_native/CustomTarget_mac.mk
+++ b/setup_native/CustomTarget_mac.mk
@@ -11,18 +11,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,setup_native/mac))
$(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: $(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)/setup_native/source/mac.po) > $${MERGEINPUT} && \
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Executable_get_command,ulfex) -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
- cp $< $@
-endif
+$(eval $(call gb_CustomTarget_ulfex_rule,\
+ $(call gb_CustomTarget_get_workdir,setup_native/mac)/macinstall.ulf,\
+ $(SRCDIR)/setup_native/source/mac/macinstall.ulf,\
+ $(foreach lang,$(gb_TRANS_LANGS),\
+ $(gb_POLOCATION)/$(lang)/setup_native/source/mac.po)))
# vim: set noet sw=4 ts=4: