diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-10-03 14:09:29 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-10-03 14:10:57 +0200 |
| commit | b08a764af938dab465fe89f431991014bc66d65f (patch) | |
| tree | bb63d2c56c1d51e50c8f6522a006431148bbdd44 /i18npool | |
| parent | cf27d95a6d508a2b5b3bd9e6ac477a3fbbd28bb1 (diff) | |
Fix the build / host confusion around icu tools.
Diffstat (limited to 'i18npool')
| -rw-r--r-- | i18npool/source/breakiterator/Makefile | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile index 8800a4231eb1..e292258184ce 100644 --- a/i18npool/source/breakiterator/Makefile +++ b/i18npool/source/breakiterator/Makefile @@ -43,16 +43,22 @@ else $(gb_Helper_execute)gendict $< $@ endif -ifeq ($(SYSTEM_ICU),YES) -GENBRK := $(SYSTEM_GENBRK) -GENCCODE := $(SYSTEM_GENCCODE) -GENCMN := $(SYSTEM_GENCMN) -USE_SED := $(shell if test "$(ICU_MAJOR)" -ge "5" -o "$(ICU_MAJOR)" = "4" -a "$(ICU_MINOR)" -ge "4"; then echo "YES"; fi) -else +ifeq ($(SYSTEM_GENBRK),) GENBRK := $(gb_Helper_execute)genbrk +else +GENBRK := $(SYSTEM_GENBRK) +endif + +ifeq ($(SYSTEM_GENCODE),) GENCCODE := $(gb_Helper_execute)genccode +else +GENCCODE := $(SYSTEM_GENCCODE) +endif + +ifeq ($(SYSTEM_GENCMN),) GENCMN := $(gb_Helper_execute)gencmn -USE_SED := YES +else +GENCMN := $(SYSTEM_GENCMN) endif TEMPFILE := $(shell $(gb_MKTEMP)) @@ -78,7 +84,7 @@ OpenOffice_dat.c : $(subst .brk,_brk.c,$(BRKFILES)) # fdo#31271 ")" reclassified in more recent ICU/Unicode Standards %.txt.p : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.txt -ifeq ($(USE_SED),YES) +ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES) sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@ else cp $< $@ |