aboutsummaryrefslogtreecommitdiff
path: root/locale/programs/localedef.c
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/programs/localedef.c
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/programs/localedef.c')
-rw-r--r--locale/programs/localedef.c6
1 files changed, 3 insertions, 3 deletions
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)