diff options
| author |   Carlos O'Donell <carlos@systemhalted.org> | 2016-02-24 20:06:04 -0500 |
|---|---|---|
| committer | Carlos O'Donell <carlos@systemhalted.org> | 2016-02-24 20:06:04 -0500 |
| commit | 314f6deec991e8239ad3fb15aeed186fabe3483f (patch) | |
| tree | c4aadd00b64f4e27ec9305b109648cbe22398bb4 /catgets | |
| parent | GB 18030-2005: Document non-rountrip and PUA mappings (bug 19575). (diff) | |
| download | glibc-314f6deec991e8239ad3fb15aeed186fabe3483f.tar.gz glibc-314f6deec991e8239ad3fb15aeed186fabe3483f.tar.bz2 glibc-314f6deec991e8239ad3fb15aeed186fabe3483f.zip | |
Enable --localedir to set message catalog directory (Bug 14259)
In 1999 the project split "localedir" into "localedir" (path to compiled
locale archives) and "msgcatdir" (path to message catalogs). This
predates the 2002 change in the GNU Coding Standard to document the use
of "localedir" for the path to the message catalogs. It appears that
newlib, gcc, and several other projects also used "msgcatdir" at one
point or another in the past, and so it is in line with historical
precedent that glibc would also use "msgcatdir." However, given that the
GNU Coding Standard uses "localedir", we will switch to that for
consistency as a GNU project. Previous uses of --localdir didn't work
anyway (see bug 14259).
I am committing this patch in the understanding that nobody would object
to fixing #14259 as part of aligning our variable usage to the GNU
Coding Standard.
Given that previous "localedir" uses were converted to "complocaledir"
by [1], we can now convert "msgcatdir" to "localedir" and complete the
transition. With an addition to config.make.in we also fix bug 14259 and
allow users to specify the locale dependent data directory with
"--localedir" at configure time. There is still no way to control at
configure time the location of the *compiled* locale directory.
Tested on x86_64 with no regressions.
Tested using "--localedir" to specify alternate locale dependent data
directory and verified with "make install DESTDIR=/tmp/glibc".
[1] 90fe682d3067163aa773feecf497ef599429457a
Diffstat (limited to 'catgets')
| -rw-r--r-- | catgets/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/catgets/Makefile b/catgets/Makefile index 0c6ac79923..053b032dc8 100644 --- a/catgets/Makefile +++ b/catgets/Makefile @@ -47,7 +47,7 @@ include ../Rules $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o) -catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' +catgets-CPPFLAGS := -DNLSPATH='"$(localedir)/%L/%N:$(localedir)/%L/LC_MESSAGES/%N:$(localedir)/%l/%N:$(localedir)/%l/LC_MESSAGES/%N:"' generated += de.msg test1.cat test1.h test2.cat test2.h sample.SJIS.cat \ test-gencat.h |