From 82cbf8f7bda811b1746d7266c88e4bc0d77bbd5b Mon Sep 17 00:00:00 2001
From: Jeffrey A Law <law@cygnus.com>
Date: Sat, 23 Jan 1999 00:43:38 +0000
Subject: [PATCH] configure.in (gcc_tooldir): When not making a relative
 gcc_tooldir...

        * configure.in (gcc_tooldir): When not making a relative gcc_tooldir,
        use $exec_prefix/$target_alias for gcc_tooldir.

From-SVN: r24824
---
 gcc/ChangeLog    | 5 +++++
 gcc/configure    | 7 +++++--
 gcc/configure.in | 5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a53af56b572..65f2ac92356 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 23 01:37:36 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* configure.in (gcc_tooldir): When not making a relative gcc_tooldir,
+	use $exec_prefix/$target_alias for gcc_tooldir.
+
 Fri Jan 22 11:48:56 1999  Richard Henderson  <rth@cygnus.com>
 
 	* cppp.c (xrealloc): Fix typo last change.
diff --git a/gcc/configure b/gcc/configure
index 92c3b4f7817..8da69e3feee 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6279,16 +6279,19 @@ fi
 
 # if $(exec_prefix) is not the same as $(prefix), then do not use a relative
 # directory to get to $gcc_tooldir.
+# Don't set gcc_tooldir to tooldir since that's only passed in by the toplevel
+# make and thus we'd get different behavior depending on where we built the
+# sources.
 if test x$exec_prefix = x$prefix; then
     gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
 else
-    gcc_tooldir='$(tooldir)'
+    gcc_tooldir='$(exec_prefix)'/${target_alias}
 fi
 
 
 # Warn if using init_priority.
 echo $ac_n "checking whether to enable init_priority by default""... $ac_c" 1>&6
-echo "configure:6292: checking whether to enable init_priority by default" >&5
+echo "configure:6295: checking whether to enable init_priority by default" >&5
 if test x$enable_init_priority != xyes; then
   enable_init_priority=no
 fi
diff --git a/gcc/configure.in b/gcc/configure.in
index 942031f89b3..dd6acd6192c 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -4099,10 +4099,13 @@ fi
 
 # if $(exec_prefix) is not the same as $(prefix), then do not use a relative
 # directory to get to $gcc_tooldir.
+# Don't set gcc_tooldir to tooldir since that's only passed in by the toplevel
+# make and thus we'd get different behavior depending on where we built the
+# sources.
 if test x$exec_prefix = x$prefix; then
     gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
 else
-    gcc_tooldir='$(tooldir)'
+    gcc_tooldir='$(exec_prefix)'/${target_alias}
 fi
 AC_SUBST(gcc_tooldir)
 
-- 
2.30.2