summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog27
-rw-r--r--Makeconfig9
-rw-r--r--aclocal.m42
-rw-r--r--config.make.in2
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
-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
-rw-r--r--localedata/Makefile2
-rw-r--r--sysdeps/gnu/configure2
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/configure2
-rw-r--r--sysdeps/unix/sysv/linux/mips/configure4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/configure2
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/configure2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/configure2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/64/configure2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/x32/configure2
21 files changed, 70 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index ca4f67f689..4146d99983 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2015-11-27 Carlos O'Donell <carlos@redhat.com>
+
+ [BZ #14259]
+ * Makeconfig: Rename localedir to complocaledir.
+ Rename inst_localedir to inst_complocaledir.
+ * aclocal.m4: Rename libc_cv_localedir to libc_cv_complocaledir.
+ * config.make.in: Use complocaledir and libc_cv_complocaledir.
+ * configure.ac: Use libc_cv_complocaledir.
+ * configure: Regenerate.
+ * locale/Makefile: Use complocaledir. Rename define -DLOCALEDIR to
+ -DCOMPLOCALEDIR.
+ * locale/findlocale.c: Use COMPLOCALEDIR.
+ * locale/loadarchive.c: Likewise.
+ * locale/programs/locale.c: Likewise.
+ * locale/programs/localedef.c: Likewise.
+ * locale/programs/locarchive.c: Likewise.
+ * localedata/Makefile: Use inst_complocaledir.
+ * sysdeps/gnu/configure: Regenerate.
+ * sysdeps/hppa/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/aarch64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/mips/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/s390/s390-64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/sparc/sparc64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/x86_64/64/configure: Regenerate.
+ * sysdeps/unix/sysv/linux/x86_64/x32/configure: Regenerate.
+
2015-11-27 Andrew Senkevich <andrew.senkevich@intel.com>
[BZ #19058]
diff --git a/Makeconfig b/Makeconfig
index 3c5d71e114..76947c6808 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -190,11 +190,12 @@ zonedir = $(datadir)/zoneinfo
endif
inst_zonedir = $(install_root)$(zonedir)
-# Where to install the locale files.
-ifndef localedir
-localedir = $(libdir)/locale
+# Where to install the compiled binary locale archive and compiled
+# binary locale files.
+ifndef complocaledir
+complocaledir = $(libdir)/locale
endif
-inst_localedir = $(install_root)$(localedir)
+inst_complocaledir = $(install_root)$(complocaledir)
# Where to install the message catalog data files (which are
# machine-independent).
diff --git a/aclocal.m4 b/aclocal.m4
index abc34d2315..3d64f7773d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -296,7 +296,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/$1';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac])
diff --git a/config.make.in b/config.make.in
index ba9c60dcaa..05ed6eca4b 100644
--- a/config.make.in
+++ b/config.make.in
@@ -12,7 +12,7 @@ datadir = @datadir@
libdir = @libdir@
slibdir = @libc_cv_slibdir@
rtlddir = @libc_cv_rtlddir@
-localedir = @libc_cv_localedir@
+complocaledir = @libc_cv_complocaledir@
sysconfdir = @libc_cv_sysconfdir@
libexecdir = @libexecdir@
rootsbindir = @libc_cv_rootsbindir@
diff --git a/configure b/configure
index 90953f0fbd..5ae092b5a0 100755
--- a/configure
+++ b/configure
@@ -603,7 +603,7 @@ use_ldconfig
libc_cv_rootsbindir
libc_cv_localstatedir
libc_cv_sysconfdir
-libc_cv_localedir
+libc_cv_complocaledir
libc_cv_rtlddir
libc_cv_slibdir
use_nscd
diff --git a/configure.ac b/configure.ac
index cd37433cae..ab18e5d826 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1763,7 +1763,7 @@ fi
AC_SUBST(libc_cv_slibdir)
AC_SUBST(libc_cv_rtlddir)
-AC_SUBST(libc_cv_localedir)
+AC_SUBST(libc_cv_complocaledir)
AC_SUBST(libc_cv_sysconfdir)
AC_SUBST(libc_cv_localstatedir)
AC_SUBST(libc_cv_rootsbindir)
diff --git a/locale/Makefile b/locale/Makefile
index f1b4343935..75afbe106c 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 9e7df12c72..b96e593e7a 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 3e18cf045b..744b61f605 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 b1de17f0d2..c8995adec2 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 c8da20b813..fd6ca516cf 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 345f9b70e2..5f91d71f1b 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[] =
{
diff --git a/localedata/Makefile b/localedata/Makefile
index ebf6ac99d9..8406e73ac2 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -199,7 +199,7 @@ $(rtld-prefix) $(common-objpfx)locale/localedef
install-locales: $(INSTALL-SUPPORTED-LOCALES)
install-locales-dir:
- $(..)./scripts/mkinstalldirs $(inst_localedir)
+ $(..)./scripts/mkinstalldirs $(inst_complocaledir)
$(INSTALL-SUPPORTED-LOCALES): install-locales-dir
@locale=`echo $@ | sed -e 's/^install-//'`; \
diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure
index 92392978fe..71243ad0c6 100644
--- a/sysdeps/gnu/configure
+++ b/sysdeps/gnu/configure
@@ -14,7 +14,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac
diff --git a/sysdeps/unix/sysv/linux/aarch64/configure b/sysdeps/unix/sysv/linux/aarch64/configure
index 60230a2eeb..f48472c5b6 100644
--- a/sysdeps/unix/sysv/linux/aarch64/configure
+++ b/sysdeps/unix/sysv/linux/aarch64/configure
@@ -11,7 +11,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac
diff --git a/sysdeps/unix/sysv/linux/mips/configure b/sysdeps/unix/sysv/linux/mips/configure
index 83f8b13aab..2d79f55335 100644
--- a/sysdeps/unix/sysv/linux/mips/configure
+++ b/sysdeps/unix/sysv/linux/mips/configure
@@ -420,7 +420,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac
@@ -434,7 +434,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib32';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
index 70bb18ad51..af069700e9 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
@@ -9,7 +9,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/configure b/sysdeps/unix/sysv/linux/s390/s390-64/configure
index 63f4194cbc..7392cdfb42 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/configure
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/configure
@@ -9,7 +9,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/configure b/sysdeps/unix/sysv/linux/sparc/sparc64/configure
index 9e5ea3c86a..8f88eff4a3 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/configure
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/configure
@@ -9,7 +9,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/configure b/sysdeps/unix/sysv/linux/x86_64/64/configure
index 570d3280a7..9d1a8d271d 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/configure
+++ b/sysdeps/unix/sysv/linux/x86_64/64/configure
@@ -9,7 +9,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/lib64';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/configure b/sysdeps/unix/sysv/linux/x86_64/x32/configure
index 6ff0f0ce32..1417da4785 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/configure
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/configure
@@ -11,7 +11,7 @@ case "$prefix" in
if test "$libdir" = '${exec_prefix}/lib'; then
libdir='${exec_prefix}/libx32';
# Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_localedir='${exec_prefix}/lib/locale'
+ libc_cv_complocaledir='${exec_prefix}/lib/locale'
fi
;;
esac
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-28 11:26:44 +0000