This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
intl patches (1)
- To: libc-alpha at sources dot redhat dot com
- Subject: intl patches (1)
- From: Bruno Haible <haible at ilog dot fr>
- Date: Mon, 19 Mar 2001 18:23:06 +0100 (CET)
To keep glibc/intl and gettext/intl in sync, I'm submitting patches that
I've applied to gettext/intl and that will appear in gettext-0.10.36.
Only one of them (the plural.y grammar) is a genuine bug fix, the others
are portability and other tweaks.
Patch #1:
GNULOCALEDIR has been replaced by LOCALEDIR, since in all cases where it
was used, it was identical to LOCALEDIR (= $prefix/share/locale).
This patch doesn't cause behaviour changes in glibc.
2001-03-17 Bruno Haible <haible@clisp.cons.org>
* intl/Makefile (CPPFLAGS): Set LOCALEDIR instead of GNULOCALEDIR.
* intl/dcigettext.c (_nl_default_dirname): Initialize with LOCALEDIR.
diff -r -c3 --exclude=plural.c intl-0/Makefile intl-99/Makefile
*** intl/Makefile Tue Feb 27 16:54:34 2001
--- intl/Makefile Sat Mar 17 14:44:06 2001
***************
*** 80,86 ****
$(objpfx)tst-translit.out: $(objpfx)tst-gettext.out
! CPPFLAGS += -D'GNULOCALEDIR="$(msgcatdir)"' \
-D'LOCALE_ALIAS_PATH="$(msgcatdir)"'
BISONFLAGS = --yacc --name-prefix=__gettext --output
--- 80,86 ----
$(objpfx)tst-translit.out: $(objpfx)tst-gettext.out
! CPPFLAGS += -D'LOCALEDIR="$(msgcatdir)"' \
-D'LOCALE_ALIAS_PATH="$(msgcatdir)"'
BISONFLAGS = --yacc --name-prefix=__gettext --output
diff -r -c3 --exclude=plural.c intl-0/dcigettext.c intl-99/dcigettext.c
*** intl/dcigettext.c Thu Jan 11 22:00:53 2001
--- intl/dcigettext.c Sat Mar 17 14:40:20 2001
***************
*** 274,280 ****
const char *_nl_current_default_domain = _nl_default_default_domain;
/* Contains the default location of the message catalogs. */
! const char _nl_default_dirname[] = GNULOCALEDIR;
/* List with bindings of specific domains created by bindtextdomain()
calls. */
--- 295,301 ----
const char *_nl_current_default_domain = _nl_default_default_domain;
/* Contains the default location of the message catalogs. */
! const char _nl_default_dirname[] = LOCALEDIR;
/* List with bindings of specific domains created by bindtextdomain()
calls. */