diff options
Diffstat (limited to 'lib/intl')
| -rw-r--r-- | lib/intl/Makefile.in | 6 | ||||
| -rw-r--r-- | lib/intl/l10nflist.c | 2 | ||||
| -rw-r--r-- | lib/intl/localealias.c | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/lib/intl/Makefile.in b/lib/intl/Makefile.in index c5245d4..00fdb61 100644 --- a/lib/intl/Makefile.in +++ b/lib/intl/Makefile.in @@ -49,13 +49,15 @@ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS) l = @INTL_LIBTOOL_SUFFIX_PREFIX@ -AR = ar +AR = @AR@ CC = @CC@ LIBTOOL = @LIBTOOL@ RANLIB = @RANLIB@ YACC = @INTLBISON@ -y -d YFLAGS = --name-prefix=__gettext +ARFLAGS = @ARFLAGS@ + LOCAL_DEFS = @LOCAL_DEFS@ DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ @@ -146,7 +148,7 @@ all-no-no: libintl.a libgnuintl.a: $(OBJECTS) rm -f $@ - $(AR) cru $@ $(OBJECTS) + $(AR) $(ARFLAGS) $@ $(OBJECTS) $(RANLIB) $@ libintl.la libgnuintl.la: $(OBJECTS) diff --git a/lib/intl/l10nflist.c b/lib/intl/l10nflist.c index 9f02487..7556c8c 100644 --- a/lib/intl/l10nflist.c +++ b/lib/intl/l10nflist.c @@ -272,7 +272,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, } if ((mask & (XPG_MODIFIER | CEN_AUDIENCE)) != 0) { - /* This component can be part of both syntaces but has different + /* This component can be part of both syntaxes but has different leading characters. For CEN we use `+', else `@'. */ *cp++ = (mask & CEN_AUDIENCE) != 0 ? '+' : '@'; cp = stpcpy (cp, modifier); diff --git a/lib/intl/localealias.c b/lib/intl/localealias.c index d99a48d..0d5ded7 100644 --- a/lib/intl/localealias.c +++ b/lib/intl/localealias.c @@ -305,7 +305,10 @@ read_alias_file (fname, fname_len) if (nmap >= maxmap) if (__builtin_expect (extend_alias_table (), 0)) - return added; + { + fclose (fp); + return added; + } alias_len = strlen (alias) + 1; value_len = strlen (value) + 1; |