aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2015-11-27 10:09:45 -0500
committerCarlos O'Donell <carlos@systemhalted.org>2015-11-27 10:22:38 -0500
commit90fe682d3067163aa773feecf497ef599429457a (patch)
tree112e4c0c097305fc1d82681b15592f0f8456f6ba /locale
parent977a30801f61b7bbc27e8f185c1e7eb49675c60c (diff)
downloadglibc-90fe682d3067163aa773feecf497ef599429457a.zip
glibc-90fe682d3067163aa773feecf497ef599429457a.tar.gz
glibc-90fe682d3067163aa773feecf497ef599429457a.tar.bz2
Rename localedir to complocaledir (bug 14259).
In preparation to fix the --localedir configure argument we must move the existing conflicting definition of localedir to a more appropriate name. Given that all current internal uses of localedir relate to the compiled locales we rename to complocaledir.
Diffstat (limited to 'locale')
-rw-r--r--locale/Makefile7
-rw-r--r--locale/findlocale.c2
-rw-r--r--locale/loadarchive.c2
-rw-r--r--locale/programs/locale.c20
-rw-r--r--locale/programs/localedef.c6
-rw-r--r--locale/programs/locarchive.c2
6 files changed, 24 insertions, 15 deletions
diff --git a/locale/Makefile b/locale/Makefile
index f1b4343..75afbe1 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -76,12 +76,15 @@ C-translit.h: C-translit.h.in gen-translit.pl
$(PERL) gen-translit.pl < $< > $@.tmp
mv -f $@.tmp $@
-localepath = "$(localedir):$(i18ndir)"
+# The path to the compiled binary locale archive or compiled locales,
+# along with the parent path to the source locales and source
+# charmaps.
+localepath = "$(complocaledir):$(i18ndir)"
# -Iprograms doesn't really belong here, but this gets it at the head
# of the list instead of the tail, where CPPFLAGS-$(lib) gets added.
# We need it before the standard -I's to see programs/config.h first.
-locale-CPPFLAGS = -DLOCALEDIR='"$(localedir)"' \
+locale-CPPFLAGS = -DCOMPLOCALEDIR='"$(complocaledir)"' \
-DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
-Iprograms
diff --git a/locale/findlocale.c b/locale/findlocale.c
index 9e7df12..b96e593 100644
--- a/locale/findlocale.c
+++ b/locale/findlocale.c
@@ -56,7 +56,7 @@ struct __locale_data *const _nl_C[] attribute_hidden =
which are somehow addressed. */
struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST];
-const char _nl_default_locale_path[] attribute_hidden = LOCALEDIR;
+const char _nl_default_locale_path[] attribute_hidden = COMPLOCALEDIR;
/* Checks if the name is actually present, that is, not NULL and not
empty. */
diff --git a/locale/loadarchive.c b/locale/loadarchive.c
index 3e18cf0..744b61f 100644
--- a/locale/loadarchive.c
+++ b/locale/loadarchive.c
@@ -42,7 +42,7 @@
/* Name of the locale archive file. */
-static const char archfname[] = LOCALEDIR "/locale-archive";
+static const char archfname[] = COMPLOCALEDIR "/locale-archive";
/* Size of initial mapping window, optimal if large enough to
cover the header plus the initial locale. */
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index b1de17f..c8995ad 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -45,7 +45,7 @@
#include "../locarchive.h"
#include <programs/xmalloc.h>
-#define ARCHIVE_NAME LOCALEDIR "/locale-archive"
+#define ARCHIVE_NAME COMPLOCALEDIR "/locale-archive"
/* If set print the name of the category. */
static int show_category_name;
@@ -325,9 +325,11 @@ select_dirs (const struct dirent *dirent)
#endif
{
struct stat64 st;
- char buf[sizeof (LOCALEDIR) + strlen (dirent->d_name) + 1];
+ char buf[sizeof (COMPLOCALEDIR)
+ + strlen (dirent->d_name) + 1];
- stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"), dirent->d_name);
+ stpcpy (stpcpy (stpcpy (buf, COMPLOCALEDIR), "/"),
+ dirent->d_name);
if (stat64 (buf, &st) == 0)
mode = st.st_mode;
@@ -444,17 +446,21 @@ write_locales (void)
first_locale = 0;
/* Now we can look for all files in the directory. */
- ndirents = scandir (LOCALEDIR, &dirents, select_dirs, alphasort);
+ ndirents = scandir (COMPLOCALEDIR, &dirents, select_dirs,
+ alphasort);
for (cnt = 0; cnt < ndirents; ++cnt)
{
/* Test whether at least the LC_CTYPE data is there. Some
directories only contain translations. */
- char buf[sizeof (LOCALEDIR) + strlen (dirents[cnt]->d_name)
- + sizeof "/LC_IDENTIFICATION"];
+ char buf[sizeof (COMPLOCALEDIR)
+ + strlen (dirents[cnt]->d_name)
+ + sizeof "/LC_IDENTIFICATION"];
char *enddir;
struct stat64 st;
- stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf, LOCALEDIR), "/"),
+ stpcpy (enddir = stpcpy (stpcpy (stpcpy (buf,
+ COMPLOCALEDIR),
+ "/"),
dirents[cnt]->d_name),
"/LC_IDENTIFICATION");
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index c8da20b..fd6ca51 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -457,11 +457,11 @@ construct_output_path (char *path)
'/'. */
ssize_t n;
if (normal == NULL)
- n = asprintf (&result, "%s%s/%s%c",
- output_prefix ?: "", LOCALEDIR, path, '\0');
+ n = asprintf (&result, "%s%s/%s%c", output_prefix ?: "",
+ COMPLOCALEDIR, path, '\0');
else
n = asprintf (&result, "%s%s/%.*s%s%s%c",
- output_prefix ?: "", LOCALEDIR,
+ output_prefix ?: "", COMPLOCALEDIR,
(int) (startp - path), path, normal, endp, '\0');
if (n < 0)
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 345f9b7..5f91d71 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -57,7 +57,7 @@
extern const char *output_prefix;
-#define ARCHIVE_NAME LOCALEDIR "/locale-archive"
+#define ARCHIVE_NAME COMPLOCALEDIR "/locale-archive"
static const char *locnames[] =
{