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

[Jan-Marek Glogowski (via logerrit)]

 solenv/gbuild/extensions/post_GbuildToJson.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 460461ae4244ef034c5579d6452dda6e8bda49e4
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Mon Jul 8 08:55:06 2019 +0000
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Jul 8 13:57:11 2019 +0200

    Fix gbuildtojson target
    
    The gbuildtojson target re-defines a lot of Make defines, including
    gb_Module_add_moduledir, so gb_Module__add_moduledir_impl needs at
    least the same fix then gb_Module__modulefile to work correctly
    with multiple directory levels.
    
    Regression from commit 368c996b24e0 ("Make font-based unit test
    depend on instdir fonts").
    
    Change-Id: I281389a79e064829db6f1231951b233ea0a7371c
    Reviewed-on: https://gerrit.libreoffice.org/75197
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index c80a662f46c8..a14f6a9145e3 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -189,7 +189,7 @@ gb_Module_add_l10n_target =
 gb_GbuildToJson_BLACKLISTEDMODULES := cli_ure jurt external
 
 define gb_Module__add_moduledir_impl
-include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(2).mk
+include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))/$(2)/Module_$(notdir $(2)).mk
 $(call gb_Module_get_target,$(1)) : $$(firstword $$(gb_Module_TARGETSTACK))
 gb_Module_TARGETSTACK := $$(wordlist 2,$$(words $$(gb_Module_TARGETSTACK)),$$(gb_Module_TARGETSTACK))