From 90fe682d3067163aa773feecf497ef599429457a Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Fri, 27 Nov 2015 10:09:45 -0500 Subject: 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. --- sysdeps/gnu/configure | 2 +- sysdeps/unix/sysv/linux/aarch64/configure | 2 +- sysdeps/unix/sysv/linux/mips/configure | 4 ++-- sysdeps/unix/sysv/linux/powerpc/powerpc64/configure | 2 +- sysdeps/unix/sysv/linux/s390/s390-64/configure | 2 +- sysdeps/unix/sysv/linux/sparc/sparc64/configure | 2 +- sysdeps/unix/sysv/linux/x86_64/64/configure | 2 +- sysdeps/unix/sysv/linux/x86_64/x32/configure | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/gnu/configure b/sysdeps/gnu/configure index 9239297..71243ad 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 60230a2..f48472c 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 83f8b13..2d79f55 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 70bb18a..af06970 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 63f4194..7392cdf 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 9e5ea3c..8f88eff 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 570d328..9d1a8d2 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 6ff0f0c..1417da4 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 -- cgit v1.1