View | Details | Raw Unified | Return to bug 14259
Collapse All | Expand All

(-)a/sysdeps/gnu/configure (-2 / +6 lines)
Lines 17-24 case "$prefix" in Link Here
17
    libc_cv_slibdir=/lib64
17
    libc_cv_slibdir=/lib64
18
    if test "$libdir" = '${exec_prefix}/lib'; then
18
    if test "$libdir" = '${exec_prefix}/lib'; then
19
      libdir='${exec_prefix}/lib64';
19
      libdir='${exec_prefix}/lib64';
20
      # Locale data can be shared between 32bit and 64bit libraries
21
      libc_cv_localedir='${exec_prefix}/lib/locale'
22
    fi
20
    fi
23
    ;;
21
    ;;
24
  *)
22
  *)
Lines 31-36 case "$prefix" in Link Here
31
  else
29
  else
32
    libc_cv_sysconfdir=$sysconfdir
30
    libc_cv_sysconfdir=$sysconfdir
33
   fi
31
   fi
32
33
  # Allow the user to override the path to locale data  with --localedir.
34
  # $localedir is set regardless of --localedir configure argument,
35
  # so we just set libc_cv_localedir here as well.
36
  # NB: Locale data can be shared between 32bit and 64bit libraries
37
  libc_cv_localedir=$localedir
34
  libc_cv_rootsbindir=/sbin
38
  libc_cv_rootsbindir=/sbin
35
  ;;
39
  ;;
36
esac
40
esac
(-)a/sysdeps/gnu/configure.in (-2 / +7 lines)
Lines 17-24 case "$prefix" in Link Here
17
    libc_cv_slibdir=/lib64
17
    libc_cv_slibdir=/lib64
18
    if test "$libdir" = '${exec_prefix}/lib'; then
18
    if test "$libdir" = '${exec_prefix}/lib'; then
19
      libdir='${exec_prefix}/lib64';
19
      libdir='${exec_prefix}/lib64';
20
      # Locale data can be shared between 32bit and 64bit libraries
21
      libc_cv_localedir='${exec_prefix}/lib/locale'
22
    fi
20
    fi
23
    ;;
21
    ;;
24
  *)
22
  *)
Lines 31-36 case "$prefix" in Link Here
31
  else
29
  else
32
    libc_cv_sysconfdir=$sysconfdir
30
    libc_cv_sysconfdir=$sysconfdir
33
   fi
31
   fi
32
33
  # Allow the user to override the path to locale data with --localedir.
34
  # $localedir is set regardless of --localedir configure argument,
35
  # so we just set libc_cv_localedir here as well.
36
  # NB: Locale data can be shared between 32bit and 64bit libraries
37
  libc_cv_localedir=$localedir
38
34
  libc_cv_rootsbindir=/sbin
39
  libc_cv_rootsbindir=/sbin
35
  ;;
40
  ;;
36
esac
41
esac

Return to bug 14259