diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2012-05-10 15:46:14 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-05-10 15:57:28 -0700 |
| commit | 674cdbc7a3d022764e83b75e73b2767a36823c91 (patch) | |
| tree | 1f17c65119ddd2ed8ed522b466e200765cc2947a /sysdeps/unix | |
| parent | 8e41b99fe1ae60276f8db4211d47ed2b1bacebf2 (diff) | |
| download | glibc-674cdbc7a3d022764e83b75e73b2767a36823c91.tar glibc-674cdbc7a3d022764e83b75e73b2767a36823c91.tar.gz glibc-674cdbc7a3d022764e83b75e73b2767a36823c91.tar.bz2 glibc-674cdbc7a3d022764e83b75e73b2767a36823c91.zip | |
Hurd: Support --prefix=/usr special-casing for all GNU systems.
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 32 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure.in | 32 |
2 files changed, 0 insertions, 64 deletions
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 31031613d3..d571d0b62b 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -382,38 +382,6 @@ fi if test -n "$sysheaders"; then CPPFLAGS=$OLD_CPPFLAGS fi -# The Linux filesystem standard prescribes where to place "essential" -# files. I.e., when the installation prefix is "/usr" we have to place -# shared library objects and the configuration files on the root partition -# in /lib and /etc. -case "$prefix" in -/usr | /usr/) - # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib. - # Allow earlier configure scripts to handle libc_cv_slibdir, libdir, - # and libc_cv_localedir. - test -n "$libc_cv_slibdir" || \ - case $machine in - sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64) - libc_cv_slibdir="/lib64" - 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' - fi - ;; - *) - libc_cv_slibdir="/lib" - ;; - esac - # Allow the user to override the path with --sysconfdir - if test $sysconfdir = '${prefix}/etc'; then - libc_cv_sysconfdir=/etc - else - libc_cv_sysconfdir=$sysconfdir - fi - libc_cv_rootsbindir="/sbin" - ;; -esac # Under Linux the NPTL add-on should be available. case $add_ons in diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index 556ca84517..916d64a605 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -121,38 +121,6 @@ fi if test -n "$sysheaders"; then CPPFLAGS=$OLD_CPPFLAGS fi -# The Linux filesystem standard prescribes where to place "essential" -# files. I.e., when the installation prefix is "/usr" we have to place -# shared library objects and the configuration files on the root partition -# in /lib and /etc. -case "$prefix" in -/usr | /usr/) - # 64-bit libraries on bi-arch platforms go in /lib64 instead of /lib. - # Allow earlier configure scripts to handle libc_cv_slibdir, libdir, - # and libc_cv_localedir. - test -n "$libc_cv_slibdir" || \ - case $machine in - sparc/sparc64 | x86_64* | powerpc/powerpc64 | s390/s390-64) - libc_cv_slibdir="/lib64" - 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' - fi - ;; - *) - libc_cv_slibdir="/lib" - ;; - esac - # Allow the user to override the path with --sysconfdir - if test $sysconfdir = '${prefix}/etc'; then - libc_cv_sysconfdir=/etc - else - libc_cv_sysconfdir=$sysconfdir - fi - libc_cv_rootsbindir="/sbin" - ;; -esac # Under Linux the NPTL add-on should be available. case $add_ons in |