diff --git a/ChangeLog b/ChangeLog
index a8e970fa7ce..5b8b941dada 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-21 Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
+	* Makefile.tpl  (BUILD_CONFIGDIRS): Remove
+	(TARGET_CONFIGDIRS): Remove
+	* configure.in: Remove AC_SUBST(target_configdirs)
+	* Makefile.in, configure: Regenerated
+
 2006-02-20  Steven G. Kargl  <kargls@comcast.net>
 
 	* MAINTAINERS (Write After Approval):  Remove myself.
@@ -1902,7 +1908,7 @@
 	of libf2c.
 	* configure, Makefile.in: Regenerate.
 
-2004-05-13  Tobias Schl�ter  <tobi@gcc.gnu.org>
+2004-05-13  Tobias Schlüter  <tobi@gcc.gnu.org>
 
 	* MAINTAINERS (Write After Approval): Add myself.
 
diff --git a/Makefile.in b/Makefile.in
index 37d5510053b..eae74a72ec2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,8 +84,6 @@ GDB_NLM_DEPS =
 # the libraries.
 RPATH_ENVVAR = @RPATH_ENVVAR@
 
-# This is the list of directories to be built for the build system.
-BUILD_CONFIGDIRS = libiberty
 # Build programs are put under this directory.
 BUILD_SUBDIR = @build_subdir@
 # This is set by the configure script to the arguments to use when configuring
@@ -178,9 +176,6 @@ POSTSTAGE1_HOST_EXPORTS = \
 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
 	  -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
 
-# This is set by the configure script to the list of directories which
-# should be built using the target tools.
-TARGET_CONFIGDIRS = @target_configdirs@
 # Target libraries are put under this directory:
 TARGET_SUBDIR = @target_subdir@
 # This is set by the configure script to the arguments to use when configuring
diff --git a/Makefile.tpl b/Makefile.tpl
index 41c50c4d494..274474a5c00 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -87,8 +87,6 @@ GDB_NLM_DEPS =
 # the libraries.
 RPATH_ENVVAR = @RPATH_ENVVAR@
 
-# This is the list of directories to be built for the build system.
-BUILD_CONFIGDIRS = libiberty
 # Build programs are put under this directory.
 BUILD_SUBDIR = @build_subdir@
 # This is set by the configure script to the arguments to use when configuring
@@ -181,9 +179,6 @@ POSTSTAGE1_HOST_EXPORTS = \
 	  -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
 	  -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
 
-# This is set by the configure script to the list of directories which
-# should be built using the target tools.
-TARGET_CONFIGDIRS = @target_configdirs@
 # Target libraries are put under this directory:
 TARGET_SUBDIR = @target_subdir@
 # This is set by the configure script to the arguments to use when configuring
diff --git a/configure b/configure
index d74e6116d6a..fc39245b2d4 100755
--- a/configure
+++ b/configure
@@ -7438,7 +7438,6 @@ s%@build_configdirs@%$build_configdirs%g
 s%@host_configargs@%$host_configargs%g
 s%@configdirs@%$configdirs%g
 s%@target_configargs@%$target_configargs%g
-s%@target_configdirs@%$target_configdirs%g
 s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
 s%@config_shell@%$config_shell%g
 s%@YACC@%$YACC%g
diff --git a/configure.in b/configure.in
index adb53b9468e..cd474f1f82b 100644
--- a/configure.in
+++ b/configure.in
@@ -2171,7 +2171,7 @@ AC_SUBST(configdirs)
 
 # Target module lists & subconfigure args.
 AC_SUBST(target_configargs)
-AC_SUBST(target_configdirs)
+
 
 # Build tools.
 AC_SUBST(CC_FOR_BUILD)