Makefile.in (gcc_tooldir): Move before first reference.

        * Makefile.in (gcc_tooldir): Move before first reference.
        Let autoconf substitute in a value.
        * configure.in (gcc_tooldir): Only use a relative path to the
        tool directory if $exec_prefix == $prefix.
        * configure: Rebuilt.

From-SVN: r24820

gcc/ChangeLog

 Fri Jan 22 07:43:01 1999  Jeffrey A Law  (law@cygnus.com)
+	
+	* Makefile.in (gcc_tooldir): Move before first reference.
+	Let autoconf substitute in a value.
+	* configure.in (gcc_tooldir): Only use a relative path to the
+	tool directory if $exec_prefix == $prefix.
+	* configure: Rebuilt.
 
 	* Makefile.in (tooldir): Replace with gcc_tooldir.
 

gcc/Makefile.in

@@ -279,6 +279,11 @@ libdir = @libdir@
 libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(version)
 # Used to produce a relative $(gcc_tooldir) in gcc.o
 unlibsubdir = ../../..
+# Directory in which to find other cross-compilation tools and headers.
+# Used in install-cross.
+gcc_tooldir = @gcc_tooldir@
+# Since tooldir does not exist at build-time, use -B$(build_tooldir)/bin/
+build_tooldir = $(exec_prefix)/$(target_alias)
 # Directory in which the compiler finds g++ includes.
 gxx_include_dir= @gxx_include_dir@
 # Directory to search for site-specific includes.
@@ -297,11 +302,6 @@ build_exeext = @build_exeext@
 # Directory in which to put man pages.
 mandir = @mandir@
 man1dir = $(mandir)/man1
-# Directory in which to find other cross-compilation tools and headers.
-# Used in install-cross.
-gcc_tooldir = $(libsubdir)/$(unlibsubdir)/../$(target_alias)
-# Since tooldir does not exist at build-time, use -B$(build_tooldir)/bin/
-build_tooldir = $(exec_prefix)/$(target_alias)
 # Dir for temp files.
 tmpdir = /tmp
 

gcc/configure.in

@@ -4097,6 +4097,15 @@ if test x$enable_haifa != x; then
     done
 fi
 
+# if $(exec_prefix) is not the same as $(prefix), then do not use a relative
+# directory to get to $gcc_tooldir.
+if test x$exec_prefix = x$prefix; then
+    gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
+else
+    gcc_tooldir='$(tooldir)'
+fi
+AC_SUBST(gcc_tooldir)
+
 # Warn if using init_priority.
 AC_MSG_CHECKING(whether to enable init_priority by default)
 if test x$enable_init_priority != xyes; then