configure.in (gcc_tooldir): Handle case where exec_prefix has not been explicitly...

        * configure.in (gcc_tooldir): Handle case where exec_prefix has
        not been explicitly set.
        * configure: Rebuilt.
Check it in now that it's tested.

From-SVN: r24831

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cd9e67f56079e2a4f71669feadb6cfb07d29f57c..f6a388db834929f5a82b4a5efec764c30aab6361 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 Sat Jan 23 01:37:36 1999  Jeffrey A Law  (law@cygnus.com)
 
+       * configure.in (gcc_tooldir): Handle case where exec_prefix has
+       not been explicitly set.
+       * configure: Rebuilt.
+
        * fold-const.c (lshift_double): Mark 'prec' arguments as possibly
        unused.
 
@@ -7,6 +11,7 @@ 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.
+       * configure: Rebuilt.
 
 Fri Jan 22 11:48:56 1999  Richard Henderson  <rth@cygnus.com>
 

diff --git a/gcc/configure b/gcc/configure
index 8da69e3feeeb32f66c7071257bc5228cd37c5b93..ee0b741060a9e787c7dcc60c32247f9bc267f70c 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -6278,11 +6278,12 @@ if test x$enable_haifa != x; then
 fi
 
 # if $(exec_prefix) is not the same as $(prefix), then do not use a relative
-# directory to get to $gcc_tooldir.
+# directory to get to $gcc_tooldir.  Also handle the case where the user did
+# not specify a value for exec_prefix.
 # 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
+if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then
     gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
 else
     gcc_tooldir='$(exec_prefix)'/${target_alias}
@@ -6291,7 +6292,7 @@ fi
 
 # Warn if using init_priority.
 echo $ac_n "checking whether to enable init_priority by default""... $ac_c" 1>&6
-echo "configure:6295: checking whether to enable init_priority by default" >&5
+echo "configure:6296: 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 dd6acd6192cb1e050d85cf166fdc6787650c8df2..c3af386399a61d7141c5fc1d9d7cdf49acd15435 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -4098,11 +4098,12 @@ if test x$enable_haifa != x; then
 fi
 
 # if $(exec_prefix) is not the same as $(prefix), then do not use a relative
-# directory to get to $gcc_tooldir.
+# directory to get to $gcc_tooldir.  Also handle the case where the user did
+# not specify a value for exec_prefix.
 # 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
+if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then
     gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
 else
     gcc_tooldir='$(exec_prefix)'/${target_alias}