Don't override a user's setting for prefix on platforms that use the

native prefix.

From-SVN: r14199

diff --git a/gcc/configure.in b/gcc/configure.in
index 21b286e1976e3ed706889d977a875bbee3cf87b9..e40dbeeaecb29d289c80510f3e9ce0b550e1ea79 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -22,10 +22,7 @@
 
 # Initialization and defaults
 AC_INIT(tree.c)
-AC_PREFIX_DEFAULT(/usr/local)
-#prefix=/usr/local
 native_prefix=/usr
-#exec_prefix='$(prefix)'
 local_prefix=/usr/local
 remove=rm
 hard_link=ln
@@ -1583,6 +1580,9 @@ for machine in $build $host $target; do
                # On NetBSD, the headers are already okay.
                fixincludes=Makefile.in
                tmake_file=t-netbsd
+               if [[ x$prefix = xNONE ]]; then
+                       prefix=$native_prefix
+               fi
                prefix=$native_prefix
                ;;
        mips-sony-bsd* | mips-sony-newsos*)     # Sony NEWS 3600 or risc/news.
@@ -2562,7 +2562,9 @@ done
 # Are we using gcc as the native compiler?
 case $host in
 *linux*)       # All Linux's use gcc as the native compiler.
-       prefix=$native_prefix
+       if [[ x$prefix = xNONE ]]; then
+               prefix=$native_prefix
+       fi
        ;;
 esac