diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a546132cf43..547f50fad7d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-05  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Change to target
+	subdir of gcc_gxx_include_dir.
+	(gcc_gxx_target_include_dir): Remove.
+
 2001-02-05  Jeffrey Oldham  <oldham@codesourcery.com>
 
 	* dwarf2out.c: Revise DWARF2 Abbreviation Glossary comments.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index cc78c6cb0f2..0786f83afd1 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -318,8 +318,6 @@ slibdir = @slibdir@
 build_tooldir = $(exec_prefix)/$(target_alias)
 # Directory in which the compiler finds target-independent g++ includes.
 gcc_gxx_include_dir = @gcc_gxx_include_dir@
-# Directory in which the compiler finds target-dependent g++ includes.
-gcc_gxx_target_include_dir = $(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/$(target_alias)/include/@libstdcxx_incdir@
 # Directory to search for site-specific includes.
 includedir = $(local_prefix)/include
 # assertdir is overridden in cross-make.
@@ -1910,7 +1908,7 @@ intl.all intl.install intl.uninstall \
 PREPROCESSOR_DEFINES = \
   -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-  -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_target_include_dir)\" \
+  -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_alias)\" \
   -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
   -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
   -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\"