i18npool/CustomTarget_breakiterator.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d29557b7efacbe0c201dfb7f8a121f558946b6a9
Author: Eike Rathke <er...@redhat.com>
Date: Mon May 15 18:15:27 2017 +0200
Use genbrk -i data include directory only if not SYSTEM_ICU
Change-Id: I8dc2f9a6ac2ad1ceec2d5e77ff547f929fa32861
diff --git a/i18npool/CustomTarget_breakiterator.mk
b/i18npool/CustomTarget_breakiterator.mk
index 11c07fe598b6..b9297ec13259 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -87,7 +87,9 @@ $(i18npool_BIDIR)/%_brk.c : $(i18npool_BIDIR)/%.brk $(call
gb_ExternalExecutable
$(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(call
gb_ExternalExecutable_get_dependencies,genbrk)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1)
$(call gb_Helper_abbreviate_dirs,\
- $(call gb_ExternalExecutable_get_command,genbrk) -i $(call
gb_UnpackedTarball_get_dir,icu)/source/data/out/tmp -r $< -o $@ $(if
$(findstring s,$(MAKEFLAGS)),> /dev/null))
+ $(call gb_ExternalExecutable_get_command,genbrk) \
+ $(if $(SYSTEM_ICU),,-i $(call
gb_UnpackedTarball_get_dir,icu)/source/data/out/tmp) \
+ -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
# fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4
# * Prepend set empty as of Unicode Version 6.1 / ICU 49, which bails out if
used.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
