From: Richard Kenner Date: Mon, 6 May 1996 02:10:03 +0000 (-0400) Subject: (gxx_include_dir): Change to $(prefix)/include/g++. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5d6be9c866bad2bef7afb394da91f6be5c557b4a;p=gcc.git (gxx_include_dir): Change to $(prefix)/include/g++. (old_gxx_include_dir): New - defined as $(libdir)/g++-include. (cccp.o, cpplib.o): Also pass OLD_GPLUSPLUS_INCLUDE_DIR (set from $(old_gxx_include_dir)). From-SVN: r11929 --- diff --git a/gcc/Makefile.in b/gcc/Makefile.in index b0dfa88aa7e..4abe5434f2d 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -199,7 +199,9 @@ libdir = $(exec_prefix)/lib # Directory in which the compiler finds executables, libraries, etc. libsubdir = $(libdir)/gcc-lib/$(target)/$(version) # Directory in which the compiler finds g++ includes. -gxx_include_dir= $(libdir)/g++-include +gxx_include_dir= $(prefix)/include/g++ +# Directory in which the old g++ header files may be found. +old_gxx_include_dir= $(libdir)/g++-include # Directory to search for site-specific includes. includedir = $(local_prefix)/include # assertdir is overridden in cross-make. @@ -1654,6 +1656,7 @@ cccp.o: cccp.c $(CONFIG_H) pcp.h version.c config.status $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \ + -DOLD_GPLUSPLUS_INCLUDE_DIR=\"$(old_gxx_include_dir)\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \ -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \ @@ -1668,6 +1671,7 @@ cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \ + -DOLD_GPLUSPLUS_INCLUDE_DIR=\"$(old_gxx_include_dir)\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \ -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \