From 1eddfef1b07c7c57df7b4d9eb00d9e7d2f6c2924 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 20 Dec 2000 06:50:19 +0000 Subject: [PATCH] Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Use build_tooldir instead of gcc_tooldir. 2000-12-19 Benjamin Kosnik * Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Use build_tooldir instead of gcc_tooldir. From-SVN: r38389 --- gcc/ChangeLog | 6 ++++++ gcc/Makefile.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 773fd88e9bd..24e0508e363 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-12-19 Benjamin Kosnik + + * Makefile.in (-DGPLUSPLUS_TOOL_INCLUDE_DIR): Use build_tooldir + instead of gcc_tooldir. + 2000-12-19 John David Anglin * system.h (getopt): Update prototype to match include/getopt.h. @@ -131,6 +136,7 @@ Tue Dec 19 00:37:08 2000 J"orn Rennecke (cpp_push_buffer): Don't generate a callback. Clear sysp. (cpp_pop_buffer): Clean up logic. +>>>>>>> 1.8655 2000-12-18 Benjamin Kosnik * configure.in (gcc_gxx_include_dir): Simplify. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 90db073bf01..eadd5c451f1 100644 --- 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\" -- 2.30.2