[Glibc-bsd-commits] r5973 - trunk/glibc-ports-2.23/kfreebsd

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-03-24 14:59:01 +0000 (Thu, 24 Mar 2016)
New Revision: 5973

Modified:
   trunk/glibc-ports-2.23/kfreebsd/configure
Log:
Merge from upstream:

commit 90fe682d3067163aa773feecf497ef599429457a
Author: Carlos O'Donell <carlos at systemhalted.org>
Date:   Fri Nov 27 10:09:45 2015 -0500

    Rename localedir to complocaledir (bug 14259).


Modified: trunk/glibc-ports-2.23/kfreebsd/configure
===================================================================
--- trunk/glibc-ports-2.23/kfreebsd/configure	2016-03-24 10:47:22 UTC (rev 5972)
+++ trunk/glibc-ports-2.23/kfreebsd/configure	2016-03-24 14:59:01 UTC (rev 5973)
@@ -296,7 +296,7 @@
     if test "$libdir" = '${exec_prefix}/lib'; then
       libdir='${exec_prefix}/lib64';
       # Locale data can be shared between 32bit and 64bit libraries
-      libc_cv_localedir='${exec_prefix}/lib/locale'
+      libc_cv_complocaledir='${exec_prefix}/lib/locale'
     fi
     ;;
   mips/mips64/n32/* )
@@ -304,7 +304,7 @@
     if test "$libdir" = '${exec_prefix}/lib'; then
       libdir='${exec_prefix}/lib32';
       # Locale data can be shared between 32bit and 64bit libraries
-      libc_cv_localedir='${exec_prefix}/lib/locale'
+      libc_cv_complocaledir='${exec_prefix}/lib/locale'
     fi
     ;;
   *)