diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-14 19:19:40 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-15 05:26:21 +0000 |
| commit | d23f8bb0caf814684a4b5820f8d4d1389d9dda14 (patch) | |
| tree | 47e28440587876a43c1b368dc5768d7d479e2f82 /solenv/gbuild/AllLangHelp.mk | |
| parent | gbuild: pass config. file to HelpTarget explicitly (diff) | |
| download | core-d23f8bb0caf814684a4b5820f8d4d1389d9dda14.tar.gz core-d23f8bb0caf814684a4b5820f8d4d1389d9dda14.zip | |
gbuild: deliver help files as packages
Change-Id: I52904567d0c7434af3f013cad7c3d9a8a67ac9f2
Reviewed-on: https://gerrit.libreoffice.org/3384
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'solenv/gbuild/AllLangHelp.mk')
| -rw-r--r-- | solenv/gbuild/AllLangHelp.mk | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index d154de24ba44..16fcc67d9e9b 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -30,7 +30,6 @@ $(or \ endef gb_AllLangHelp__get_helpname = $(1)/$(2) -gb_AllLangHelp__get_zipname = $(1)_$(2) $(dir $(call gb_AllLangHelp_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) @@ -45,22 +44,18 @@ $(call gb_AllLangHelp_get_target,%) : $(call gb_AllLangHelp_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),ALH,5) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_AllLangHelp_get_target,$*) $(HELP_DELIVERABLES) \ + rm -f $(call gb_AllLangHelp_get_target,$*) \ ) -# gb_AllLangHelp_AllLangHelp__one_lang module lang helpname zipname +# gb_AllLangHelp_AllLangHelp__one_lang module lang helpname define gb_AllLangHelp_AllLangHelp__one_lang $(call gb_HelpTarget_HelpTarget,$(3),$(1),$(2)) $(call gb_HelpTarget_set_helpdir,$(3),$(gb_AllLangHelp_HELPDIR)) -$(call gb_HelpTarget_get_outdir_target,$(4)) : $(call gb_HelpTarget_get_target,$(3)) -$(call gb_HelpTarget_get_outdir_target,$(4)) :| $(dir $(call gb_HelpTarget_get_outdir_target,$(4))).dir -$(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_outdir_target,$(4)) $(call gb_AllLangHelp_get_target,$(1)) : $(call gb_HelpTarget_get_target,$(3)) +$(call gb_AllLangHelp_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_HelpTarget_get_packagename,$(3))) $(call gb_AllLangHelp_get_clean_target,$(1)) : $(call gb_HelpTarget_get_clean_target,$(3)) -$(call gb_AllLangHelp_get_clean_target,$(1)) : HELP_DELIVERABLES += $(call gb_HelpTarget_get_outdir_target,$(4)) - -$(call gb_Deliver_add_deliverable,$(call gb_HelpTarget_get_outdir_target,$(4)),$(call gb_HelpTarget_get_target,$(3)),$(1)) +$(call gb_AllLangHelp_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_HelpTarget_get_packagename,$(3))) endef @@ -68,11 +63,9 @@ endef # # gb_AllLangHelp_AllLangHelp module define gb_AllLangHelp_AllLangHelp -$(call gb_AllLangHelp_get_clean_target,$(1)) : HELP_DELIVERABLES := - $(foreach lang,$(gb_AllLangHelp_LANGS),\ $(if $(call gb_AllLangHelp__translation_exists,$(lang)),\ - $(call gb_AllLangHelp_AllLangHelp__one_lang,$(1),$(lang),$(call gb_AllLangHelp__get_helpname,$(1),$(lang)),$(call gb_AllLangHelp__get_zipname,$(1),$(lang))))) + $(call gb_AllLangHelp_AllLangHelp__one_lang,$(1),$(lang),$(call gb_AllLangHelp__get_helpname,$(1),$(lang))))) $(call gb_AllLangHelp_get_target,$(1)) :| $(dir $(call gb_AllLangHelp_get_target,$(1))).dir |