Makefile.in (gcc_gxx_target_include_dir): Use instead of build_tooldir and libstdcxx_incdir.

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

	* Makefile.in (gcc_gxx_target_include_dir): Use instead of
	build_tooldir and libstdcxx_incdir.

From-SVN: r38412
This commit is contained in:
Benjamin Kosnik 2000-12-21 07:19:41 +00:00 committed by Benjamin Kosnik
parent 01c70ab016
commit 9d680205ed
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
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

View File

@ -316,8 +316,8 @@ gcc_tooldir = @gcc_tooldir@
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.
@ -1871,7 +1871,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=\"$(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\"