Revert "configure: default to --prefix=/usr on GNU/Linux"

This reverts commit 81439a116cf48583127ddf1f09809440aa40969a.

diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 8cda8e945146e19582344ded04d1eda78d3f863e..4d642e953bd28eb9d280588e90225c7f69c5a843 100644 (file)
--- 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 4c43cda87728ee938099309c2aefad7fdd4a9253..c177e082a96d1525e1ff209d2e537a7ed96f019f 100644 (file)
--- 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