Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Use build_tooldir instead of gcc_tooldir.

2000-12-19  Benjamin Kosnik  <bkoz@redhat.com>

	* Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Use build_tooldir
	instead of gcc_tooldir.

From-SVN: r38389

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 773fd88e9bde0e92d87d78e2fe1485c131c876a3..24e0508e363861666a61a3b851376a0c29b5e756 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-19  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Use build_tooldir
+       instead of gcc_tooldir.
+
 2000-12-19  John David Anglin  <dave@hiauly1.hia.nrc.ca>
 
        * system.h (getopt): Update prototype to match include/getopt.h.
@@ -131,6 +136,7 @@ Tue Dec 19 00:37:08 2000  J"orn Rennecke <amylaar@redhat.com>
         (cpp_push_buffer): Don't generate a callback.  Clear sysp.
         (cpp_pop_buffer): Clean up logic.
 
+>>>>>>> 1.8655
 2000-12-18  Benjamin Kosnik  <bkoz@redhat.com>
 
        * configure.in (gcc_gxx_include_dir): Simplify.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 90db073bf01dc6a06ffd050da25c6f5fb86487d9..eadd5c451f1533dfc5af5eb8c7e4df18c81190ca 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1868,7 +1868,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_tooldir)/include/$(libstdcxx_incdir)\" \
+  -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(build_tooldir)/include/$(libstdcxx_incdir)\" \
   -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
   -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
   -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\"