diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-07-22 03:51:04 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-07-22 03:51:04 +0200 |
| commit | 49a2795539cd7db92b52979e5ed326fdf401b447 (patch) | |
| tree | 9dcd7ca3ff61401b2fca0cde2376d70b0d75b501 | |
| parent | ceedd394172ce172d14d3d8647cbb50eaecb75de (diff) | |
Revert the CustomTarget_collator.mk change
gb_Helper_optional_locale is not available yet in gbuild
Change-Id: Iae5cb7d4e0f179ba97a3b6bee7ab3a9ea9c53bd4
| -rw-r--r-- | i18npool/CustomTarget_collator.mk | 55 |
1 files changed, 22 insertions, 33 deletions
diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index f1ba808373ac..bf57ae3445f9 100644 --- a/i18npool/CustomTarget_collator.mk +++ b/i18npool/CustomTarget_collator.mk @@ -12,39 +12,28 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator)) i18npool_ICULT53 := $(filter 1, $(shell expr $(ICU_MAJOR) \< 53)) i18npool_CODIR := $(call gb_CustomTarget_get_workdir,i18npool/collator) i18npool_COTXTS := \ - $(call gb_Helper_optional_locale,ca, \ - ca_charset.txt) \ - $(call gb_Helper_optional_locale,dz, \ - dz_charset.txt) \ - $(call gb_Helper_optional_locale,hu, \ - hu_charset.txt) \ - $(call gb_Helper_optional_locale,ja, \ - ja_charset.txt \ - ja_phonetic_alphanumeric_first.txt \ - ja_phonetic_alphanumeric_last.txt) \ - $(if $(i18npool_ICULT53), \ - $(call gb_Helper_optional_locale,ko, \ - ko_charset.txt) \ - ) \ - $(call gb_Helper_optional_locale,ku, \ - ku_alphanumeric.txt) \ - $(call gb_Helper_optional_locale,ln, \ - ln_charset.txt) \ - $(call gb_Helper_optional_locale,my, \ - my_dictionary.txt) \ - $(call gb_Helper_optional_locale,ne, \ - ne_charset.txt) \ - $(call gb_Helper_optional_locale,sid, \ - sid_charset.txt) \ - $(call gb_Helper_optional_locale,zh, \ - zh_charset.txt \ - zh_pinyin.txt \ - zh_radical.txt \ - zh_stroke.txt \ - zh_TW_charset.txt \ - zh_TW_radical.txt \ - zh_TW_stroke.txt \ - zh_zhuyin.txt) + ca_charset.txt \ + dz_charset.txt \ + hu_charset.txt \ + ja_charset.txt \ + ja_phonetic_alphanumeric_first.txt \ + ja_phonetic_alphanumeric_last.txt \ + $(if $(i18npool_ICULT53), \ + ko_charset.txt \ + ) \ + ku_alphanumeric.txt \ + ln_charset.txt \ + my_dictionary.txt \ + ne_charset.txt \ + sid_charset.txt \ + zh_charset.txt \ + zh_pinyin.txt \ + zh_radical.txt \ + zh_stroke.txt \ + zh_TW_charset.txt \ + zh_TW_radical.txt \ + zh_TW_stroke.txt \ + zh_zhuyin.txt $(call gb_CustomTarget_get_target,i18npool/collator) : $(SRCDIR)/i18npool/CustomTarget_collator.mk \ $(i18npool_CODIR)/lrl_include.hxx $(foreach txt,$(i18npool_COTXTS), \ |