[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - i18npool/CustomTarget_breakiterator.mk

[Tor Lillqvist (via logerrit)]

 i18npool/CustomTarget_breakiterator.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68a67ec4cc41aa4b6c030b93d31ebfb08cc13149
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 26 15:47:26 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 26 16:02:40 2020 +0100

    tdf#138481: Trust the break iterator character data in a bundled ICU
    
    Don't use our own char.txt when using a bundled ICU.
    
    Quite possibly we wouldn't need to use the other data in the
    i18npool/source/breakiterator/data folder either when using a bundled
    ICU. (Or a new enough system ICU.) See the README file there for the
    sad details.)
    
    Change-Id: I82923ae76407fdd3fa3642d818d43427fe4f5591
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106696
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index 560906ea90aa..546b1ebde125 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -47,7 +47,7 @@ endif
 
 i18npool_BRKTXTS := \
     $(if $(i18npool_breakiterator_want_in),char_in.brk) \
-    char.brk \
+    $(if $(SYSTEM_ICU),char.brk) \
     count_word.brk \
     $(call gb_Helper_optional_locale,he,dict_word_he.brk) \
     $(call gb_Helper_optional_locale,hu,dict_word_hu.brk) \