diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-09-25 11:48:42 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-09-25 11:48:42 +0000 |
| commit | 9f8088b0807e584ba5f00e034213fb5696b3e85f (patch) | |
| tree | 2e0c9bb9ecda441ae01f0088af796c7e5bc0d972 | |
| parent | 78b781b933a187eebdc08b3e8eb451ab030d69d3 (diff) | |
- add missing dependency on lt_defines.h
- retry with some different locale if en_US happens not to be there
| -rw-r--r-- | extra/locale/Makefile.in | 5 | ||||
| -rw-r--r-- | extra/locale/gen_wctype.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in index 078eb6527..faea8c0d5 100644 --- a/extra/locale/Makefile.in +++ b/extra/locale/Makefile.in @@ -127,7 +127,8 @@ $(locale_OUT)/c8tables.h: $(locale_OUT)/gen_wc8bit $(locale_OUT)/codesets.txt # Warning! Beware tr_TR toupper/tolower exceptions! $(locale_OUT)/wctables.h: $(locale_OUT)/gen_wctype - $< en_US + $< en_US || $< en_US.UTF-8 || $< en_US.iso8859-1 \ + || $< en_GB || $< en_GB.UTF-8 $(locale_OUT)/locale_tables.h: $(locale_OUT)/gen_locale $(locale_OUT)/locales.txt $< $(word 2,$^) @@ -159,7 +160,7 @@ $(locale_OUT)/uClibc_locale_data.h: $(locale_SRC) else -$(locale_SRC): $(locale_OUT)/gen_ldc +$(locale_SRC): $(locale_OUT)/gen_ldc $(locale_OUT)/lt_defines.h $< $(locale_OUT)/uClibc_locale_data.h: $(locale_OUT)/lt_defines.h $(locale_OUT)/c8tables.h $(locale_OUT)/wctables.h $(locale_DIR)/locale_mmap.h | $(locale_SRC) diff --git a/extra/locale/gen_wctype.c b/extra/locale/gen_wctype.c index dca5cff0d..68fb26eec 100644 --- a/extra/locale/gen_wctype.c +++ b/extra/locale/gen_wctype.c @@ -736,7 +736,7 @@ int main(int argc, char **argv) printf("done\n"); } - if (1) { + if (built) { FILE *fp; if (!(fp = fopen("wctables.h", "w"))) { @@ -771,7 +771,7 @@ int main(int argc, char **argv) fclose(fp); } - return EXIT_SUCCESS; + return !built; } size_t newopt(unsigned char *ut, size_t usize, int shift, table_data *tbl) |