+2000-12-20 Benjamin Kosnik <bkoz@redhat.com>
+
+ * Makefile.in (gcc_gxx_target_include_dir): Use instead of
+ build_tooldir and libstdcxx_incdir.
+
2000-12-20 Robert Lipe <robertlipe@usa.net>
* haifa-sched.c (schedule_block): Provide empty source statement
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 where the compiler finds target-dependent files.
-libstdcxx_incdir = @libstdcxx_incdir@
+# Directory in which the compiler finds target-dependent g++ includes.
+gcc_gxx_target_include_dir = $(build_tooldir)/include/@libstdcxx_incdir@
# Directory to search for site-specific includes.
includedir = $(local_prefix)/include
# assertdir is overridden in cross-make.
PREPROCESSOR_DEFINES = \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
- -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(build_tooldir)/include/$(libstdcxx_incdir)\" \
+ -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_target_include_dir)\" \
-DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
-DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
-DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\"