diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-14 16:51:52 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-15 05:23:49 +0000 |
| commit | cc1c050390ee68105f2f67edf3b6005880861c9b (patch) | |
| tree | cf4f636bc457e0dfe7764fce24c7f8a857d06f3c /solenv/gbuild/AllLangHelp.mk | |
| parent | add error checking into installer/filelist.pm (diff) | |
| download | core-cc1c050390ee68105f2f67edf3b6005880861c9b.tar.gz core-cc1c050390ee68105f2f67edf3b6005880861c9b.zip | |
gbuild: pass config. file to HelpTarget explicitly
This is preparation for delivering HelpTarget files as a Package, which
would not be possible with the previous impl.
Change-Id: Ia79effcb77aaa7054987879c394cb277e377c9d8
Reviewed-on: https://gerrit.libreoffice.org/3383
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index 95cdd8c40c8b..d154de24ba44 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -51,7 +51,6 @@ $(call gb_AllLangHelp_get_clean_target,%) : # gb_AllLangHelp_AllLangHelp__one_lang module lang helpname zipname define gb_AllLangHelp_AllLangHelp__one_lang $(call gb_HelpTarget_HelpTarget,$(3),$(1),$(2)) -$(call gb_HelpTarget_set_configdir,$(3),$(gb_AllLangHelp_AUXDIR)) $(call gb_HelpTarget_set_helpdir,$(3),$(gb_AllLangHelp_HELPDIR)) $(call gb_HelpTarget_get_outdir_target,$(4)) : $(call gb_HelpTarget_get_target,$(3)) @@ -156,6 +155,7 @@ endef define gb_AllLangHelp__use_linked_module $(call gb_HelpTarget_use_linked_module,$(call gb_AllLangHelp__get_helpname,$(1),$(3)),$(call gb_AllLangHelp__get_helpname,$(2),$(3))) $(call gb_HelpTarget_set_indexed,$(call gb_AllLangHelp__get_helpname,$(1),$(3))) +$(call gb_HelpTarget_set_configfile,$(call gb_AllLangHelp__get_helpname,$(1),$(3)),$(gb_AllLangHelp_AUXDIR)/$(3)/$(1)) endef |