Makeconfig | 2 +-
aclocal.m4 | 2 +-
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 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff -Nurp glibc-2.20.orig/aclocal.m4 glibc-2.20/aclocal.m4
--- glibc-2.20.orig/aclocal.m4 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/aclocal.m4 2014-09-08 02:52:40.478092077 +0300
@@ -295,7 +295,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_localedir='${datadir}/locale'
fi
;;
esac])
diff -Nurp glibc-2.20.orig/Makeconfig glibc-2.20/Makeconfig
--- glibc-2.20.orig/Makeconfig 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/Makeconfig 2014-09-08 02:42:51.676589098 +0300
@@ -192,7 +192,7 @@ inst_zonedir = $(install_root)$(zonedir)
# Where to install the locale files.
ifndef localedir
-localedir = $(libdir)/locale
+localedir = $(datadir)/locale
endif
inst_localedir = $(install_root)$(localedir)
diff -Nurp glibc-2.20.orig/sysdeps/gnu/configure glibc-2.20/sysdeps/gnu/configure
--- glibc-2.20.orig/sysdeps/gnu/configure 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/sysdeps/gnu/configure 2014-09-08 02:53:30.420303497 +0300
@@ -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_localedir='${datadir}/locale'
fi
;;
esac
diff -Nurp glibc-2.20.orig/sysdeps/unix/sysv/linux/aarch64/configure glibc-2.20/sysdeps/unix/sysv/linux/aarch64/configure
--- glibc-2.20.orig/sysdeps/unix/sysv/linux/aarch64/configure 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/sysdeps/unix/sysv/linux/aarch64/configure 2014-09-08 02:47:12.090701035 +0300
@@ -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_localedir='${datadir}/locale'
fi
;;
esac
diff -Nurp glibc-2.20.orig/sysdeps/unix/sysv/linux/mips/configure glibc-2.20/sysdeps/unix/sysv/linux/mips/configure
--- glibc-2.20.orig/sysdeps/unix/sysv/linux/mips/configure 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/sysdeps/unix/sysv/linux/mips/configure 2014-09-08 02:48:15.985972467 +0300
@@ -278,7 +278,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_localedir='${datadir}/locale'
fi
;;
esac
@@ -292,7 +292,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_localedir='${datadir}/locale'
fi
;;
esac
diff -Nurp glibc-2.20.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure
--- glibc-2.20.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/configure 2014-09-08 02:48:59.632157210 +0300
@@ -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_localedir='${datadir}/locale'
fi
;;
esac
diff -Nurp glibc-2.20.orig/sysdeps/unix/sysv/linux/s390/s390-64/configure glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-64/configure
--- glibc-2.20.orig/sysdeps/unix/sysv/linux/s390/s390-64/configure 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-64/configure 2014-09-08 02:49:19.879242946 +0300
@@ -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_localedir='${datadir}/locale'
fi
;;
esac
diff -Nurp glibc-2.20.orig/sysdeps/unix/sysv/linux/sparc/sparc64/configure glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc64/configure
--- glibc-2.20.orig/sysdeps/unix/sysv/linux/sparc/sparc64/configure 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc64/configure 2014-09-08 02:49:45.699352249 +0300
@@ -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_localedir='${datadir}/locale'
fi
;;
esac
diff -Nurp glibc-2.20.orig/sysdeps/unix/sysv/linux/x86_64/64/configure glibc-2.20/sysdeps/unix/sysv/linux/x86_64/64/configure
--- glibc-2.20.orig/sysdeps/unix/sysv/linux/x86_64/64/configure 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/sysdeps/unix/sysv/linux/x86_64/64/configure 2014-09-08 02:50:22.947509928 +0300
@@ -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_localedir='${datadir}/locale'
fi
;;
esac
diff -Nurp glibc-2.20.orig/sysdeps/unix/sysv/linux/x86_64/x32/configure glibc-2.20/sysdeps/unix/sysv/linux/x86_64/x32/configure
--- glibc-2.20.orig/sysdeps/unix/sysv/linux/x86_64/x32/configure 2014-09-07 11:09:09.000000000 +0300
+++ glibc-2.20/sysdeps/unix/sysv/linux/x86_64/x32/configure 2014-09-08 02:50:42.972594672 +0300
@@ -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_localedir='${datadir}/locale'
fi
;;
esac
