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.

diff --git a/ChangeLog b/ChangeLog
index ca4f67f689fccf9bda9a7a803e71157f1b087b15..4146d99983799f690cb026f57e19acc24887551d 100644 (file)
--- 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 3c5d71e114cdc95cb78451c23ed64a5cbee32d0b..76947c680882f2c7d237054dddd2aecd36247e35 100644 (file)
--- 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 abc34d231535048e2e18473b3c6a8fb484b43596..3d64f7773d02dc96ccd318b829bdbdd9c57bd1cd 100644 (file)
--- 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 ba9c60dcaada7062229df16b72d5fe40b8407dad..05ed6eca4b877e3869c08b717555f88276ce6c12 100644 (file)
--- 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 90953f0fbda6f98264136ff3f42a0da3e987e6ef..5ae092b5a084526e50716882f01e319fb9fd87fa 100755 (executable)
--- 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 cd37433cae1a4c96dd77fdf5eaad1739871362f2..ab18e5d826f672e9f2ea5e4b255dce4364515f67 100644 (file)
--- 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 f1b4343935cbddf494cd25172d58452d33490fd6..75afbe106c907552766cb76e958b1d11fca549f9 100644 (file)
--- 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 9e7df12c720fa1aa83cc925167e02482bc9749c1..b96e593e7a6c46d32c7744ed9e7b537fe9ba3f4a 100644 (file)
--- 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 3e18cf045b95892108ee9aa2b73ee7e67672328d..744b61f605014dc7e39f1de17bc11b8f6d3673b3 100644 (file)
--- 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 b1de17f0d2acf42d5057d9bc260134e375946e42..c8995adec2610c91b3e544acf9590699383eea1b 100644 (file)
--- 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 c8da20b813353d096ecaa2a7ccb26578433db91f..fd6ca516cf0d57a13bf5abe9ca5c9a88b7c75104 100644 (file)
--- 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 345f9b70e27ff4f666c2dcfffac76b82fa01c1ad..5f91d71f1beea7c14ffb8621d695100a7a824536 100644 (file)
--- 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 ebf6ac99d91c500eceaeb8e14383f5974468b99f..8406e73ac21548d9bd1a37c58fee2683cfa70076 100644 (file)
--- 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 92392978fe1008a560d1be4ee83252b19207fceb..71243ad0c6ae7451efa15b083662e08038dfdb4d 100644 (file)
--- 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 60230a2eeb3ee968f3ba736082d21db08afae211..f48472c5b691e6c6a24459d7ae9a36ecf7128514 100644 (file)
--- 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 83f8b13aab677c154f176acac7d60bb796e70a95..2d79f55335f9462c254dffb7b39fd2047bd9074c 100644 (file)
--- 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 70bb18ad51194cdfaee7ed32307a7e9b8c15d9a4..af069700e9e41ce04256c68a34f6f5ef790b2c1c 100644 (file)
--- 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 63f4194cbceb9a000ca5764048251c4921077d7a..7392cdfb426f63cf892fa2f3ddb2a95395bd2deb 100644 (file)
--- 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 9e5ea3c86a2c32aa8a63077d0bcce0ae4dfed913..8f88eff4a3afdebe8b2e63c7c4ee17ab98dfae88 100644 (file)
--- 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 570d3280a73a7c751dcaba57059b0158915128a2..9d1a8d271d7e7fbc56d916be25f3c7a52429ea67 100644 (file)
--- 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 6ff0f0ce3291643daa1b3d47134584675572ee91..1417da478553d80c01c9d9d40c7369a31210f8e1 100644 (file)
--- 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