* configure.in: Use ./config.cache, not config.cache.

	* configure: Regenerate.
	* Makefile.tpl: Special-casing not needed for GCC any more.
	* Makefile.in: Regenerate.

5 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 45f649190..af149b1e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-01-04  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+	* configure.in: Use ./config.cache, not config.cache.
+	* configure: Regenerate.
+	* Makefile.tpl: Special-casing not needed for GCC any more.
+	* Makefile.in: Regenerate.
+
 	* configure.in: Don't share a cache file for host dirs.
 	* configure: Regenerate.
 
diff --git a/Makefile.in b/Makefile.in
index c8dad9cc6..51d9dd4e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23612,7 +23612,7 @@ configure-gcc:
 	    libsrcdir="$$s/gcc";; \
 	esac; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} --cache-file=config.cache \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
 	  || exit 1
 
 # Don't 'make all' in gcc if it's already been made by 'bootstrap'; that
diff --git a/Makefile.tpl b/Makefile.tpl
index af5b2910c..7a7e3eb04 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1109,7 +1109,7 @@ configure-gcc:
 	    libsrcdir="$$s/gcc";; \
 	esac; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} --cache-file=config.cache \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
 	  || exit 1
 
 # Don't 'make all' in gcc if it's already been made by 'bootstrap'; that
diff --git a/configure b/configure
index 307d9c096..88d3753ed 100755
--- a/configure
+++ b/configure
@@ -2590,7 +2590,7 @@ esac
 
 # Host dirs don't like to share a cache file either, horribly enough.
 # This seems to be due to autoconf 2.5x stupidity.
-host_configargs="--cache-file=config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}"
+host_configargs="--cache-file=./config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}"
 
 target_configargs=${baseargs}
 
@@ -2624,7 +2624,7 @@ fi
 # directory.  I think.
 
 # Pass the appropriate --host, --build, and --cache-file arguments.
-target_configargs="--cache-file=config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
+target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
 
 # provide a proper gxx_include_dir.
 # Note, if you change the default, make sure to fix both here and in
diff --git a/configure.in b/configure.in
index c84f1a624..b286f1aa7 100644
--- a/configure.in
+++ b/configure.in
@@ -1828,7 +1828,7 @@ esac
 
 # Host dirs don't like to share a cache file either, horribly enough.
 # This seems to be due to autoconf 2.5x stupidity.
-host_configargs="--cache-file=config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}"
+host_configargs="--cache-file=./config.cache --build=${build_alias} --host=${host_alias} --target=${target_alias} ${extra_host_args} ${baseargs}"
 
 target_configargs=${baseargs}
 
@@ -1862,7 +1862,7 @@ fi
 # directory.  I think.
 
 # Pass the appropriate --host, --build, and --cache-file arguments.
-target_configargs="--cache-file=config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
+target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}"
 
 # provide a proper gxx_include_dir.
 # Note, if you change the default, make sure to fix both here and in