aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2025-01-08 16:55:05 -0500
committerDJ Delorie <dj@redhat.com>2025-01-08 16:55:05 -0500
commit0bba6c29a1c4697bcdc1e6d29657bb6dbbd21afb (patch)
tree65d67808785481d75a5d8e90084dccaba5183dc2
parent274f73978cc0cd17cdcf021f1191d49c30e5bdd5 (diff)
downloadglibc-0bba6c29a1c4697bcdc1e6d29657bb6dbbd21afb.zip
glibc-0bba6c29a1c4697bcdc1e6d29657bb6dbbd21afb.tar.gz
glibc-0bba6c29a1c4697bcdc1e6d29657bb6dbbd21afb.tar.bz2
Revert "configure: default to --prefix=/usr on GNU/Linux"
This reverts commit 81439a116cf48583127ddf1f09809440aa40969a.
-rw-r--r--sysdeps/unix/sysv/linux/configure5
-rw-r--r--sysdeps/unix/sysv/linux/configure.ac4
2 files changed, 2 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 8cda8e9..4d642e9 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -1,4 +1,3 @@
-ac_default_prefix=/usr
# This file is generated from configure.ac by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/unix/sysv/linux.
@@ -117,9 +116,7 @@ if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi
-
-
-if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/"; then
+if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then
if test $enable_sanity = yes; then
echo "\
*** On GNU/Linux systems the GNU C Library should not be installed into
diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac
index 4c43cda..c177e08 100644
--- a/sysdeps/unix/sysv/linux/configure.ac
+++ b/sysdeps/unix/sysv/linux/configure.ac
@@ -71,9 +71,7 @@ if test -n "$sysheaders"; then
CPPFLAGS=$OLD_CPPFLAGS
fi
-AC_PREFIX_DEFAULT([/usr])
-
-if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/"; then
+if test "$prefix" = "/usr/local" -o "$prefix" = "/usr/local/" -o "$prefix" = "NONE"; then
if test $enable_sanity = yes; then
echo "\
*** On GNU/Linux systems the GNU C Library should not be installed into