diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-07-16 14:54:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-16 16:54:59 +0200 |
| commit | 85c7e212a26b24883b9a001b6529efeb80955809 (patch) | |
| tree | 61e29807b75c37191d8ac53055ec4d62507bd0c2 /instsetoo_native/CustomTarget_install.mk | |
| parent | 2bbf5d5bcffd2218f6b48fdfa4965735cbd4dd68 (diff) | |
gbuild: consolidate ULF copypaste in gb_CustomTarget_ulfex_rule
Change-Id: I0c5b68f6bc81c7c1c88be2cde42fc06949fff8e7
Diffstat (limited to 'instsetoo_native/CustomTarget_install.mk')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 573b9c6262c1..e3a52f2cd1fb 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -35,23 +35,14 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-% cat $< | tr -d "\015" > $@ chmod a+x $@ -ifneq ($(WITH_LANG),) $(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_Postprocess_get_target,AllModulesButInstsetNative) - $(call gb_Output_announce,$@,$(true),SUM,1) - 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) -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 \ - $(call gb_Postprocess_get_target,AllModulesButInstsetNative) - cp $< $@ -endif + | $(call gb_Postprocess_get_target,AllModulesButInstsetNative) + +$(eval $(call gb_CustomTarget_ulfex_rule,\ + $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf,\ + $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf,\ + $(foreach lang,$(gb_TRANS_LANGS),\ + $(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po))) export ENABLE_DOWNLOADSETS ?= TRUE ifeq ($(OS),LINUX) |