Permalink
Browse files

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.
  • Loading branch information...
Carlos O'Donell
Carlos O'Donell committed Nov 27, 2015
1 parent 977a308 commit 90fe682d3067163aa773feecf497ef599429457a
@@ -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]
@@ -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).
@@ -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])
@@ -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@
@@ -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
@@ -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)
@@ -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

@@ -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. */
@@ -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. */
@@ -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");

@@ -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)
@@ -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[] =
{
@@ -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-//'`; \
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

0 comments on commit 90fe682

Please sign in to comment.