[Libreoffice-commits] core.git: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/AllLangHelp.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d2b91b1caaa0e32f66b90f4e40cf24d91bb2b301
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Nov 14 13:52:27 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Nov 14 16:22:50 2018 +0100

    Prepare gb_AllLangHelp_add_helpfiles for special bookmark needs
    
    ...where (according to a request by buovjaga) in instdir/help/*/bookmarks.js,
    lines mentioning "/shared/explorer/database/" should appear with app:"BASE"
    instead of app:"SHARED".
    
    That change will come in a follow-up commit to the helpcontent2 repo.
    
    Change-Id: I7c99e5f89e001d1e507f283d16e2ee264f3ab33a
    Reviewed-on: https://gerrit.libreoffice.org/63364
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk
index 7edaf7d68407..22d5ad8b533b 100644
--- a/solenv/gbuild/AllLangHelp.mk
+++ b/solenv/gbuild/AllLangHelp.mk
@@ -87,13 +87,14 @@ endef
 
 # Add one or more help files.
 #
-# gb_AllLangHelp_add_helpfiles module file(s)
+# gb_AllLangHelp_add_helpfiles module file(s) [optional bookmark token]
 define gb_AllLangHelp_add_helpfiles
 $(foreach lang,$(gb_HELP_LANGS),\
 	$(call gb_HelpTarget_add_helpfiles,$(call gb_AllLangHelp__get_helpname,$(1),$(lang)),$(2)) \
 )
 ifneq ($(ENABLE_HTMLHELP),)
 gb_AllLangHelp_$(1)_HELPFILES += $(addsuffix .xhp,$(2))
+gb_AllLangHelp_$(or $(3),$(1))_BOOKMARK_HELPFILES += $(addsuffix .xhp,$(2))
 $(call gb_AllLangHelp_get_helpfiles_target,$(1)): $(addprefix $(SRCDIR)/,$(addsuffix .xhp,$(2)))
 endif