(gxx_prefix): New; default to $(libdir).

(GPLUSPLUS_INCLUDE_DIR): Change to $(gxx_prefix)/g++-include.

From-SVN: r6709

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index be41a89339e9f2c1762e7de729749cb9a8441dba..4e3f263a33adbb8455a280a912787fb5bc3a058d 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -155,6 +155,8 @@ bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
 # Directory in which the compiler finds executables, libraries, etc.
 libsubdir = $(libdir)/gcc-lib/$(target)/$(version)
+# The prefix for g++ includes.
+gxx_prefix= $(libdir)
 # Directory to search for site-specific includes.
 includedir = $(local_prefix)/include
 # assertdir is overridden in cross-make.
@@ -1400,7 +1402,7 @@ cccp.o: cccp.c $(CONFIG_H) pcp.h version.c config.status
 # is for compatibility with the current version of libg++.
        $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
          -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-         -DGPLUSPLUS_INCLUDE_DIR=\"$(libdir)/g++-include\" \
+         -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_prefix)/g++-include\" \
          -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
          -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
          -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
@@ -1425,7 +1427,7 @@ unprotoize.o:     stamp-proto ; @true
 stamp-proto:   $(srcdir)/protoize.c getopt.h $(CONFIG_H)
        $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
           -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-          -DGPLUSPLUS_INCLUDE_DIR=\"$(libdir)/g++-include\" \
+          -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_prefix)/g++-include\" \
           -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
          -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
          -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \
@@ -1434,7 +1436,7 @@ stamp-proto:      $(srcdir)/protoize.c getopt.h $(CONFIG_H)
        mv protoize.o unprotoize.o
        $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
           -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-          -DGPLUSPLUS_INCLUDE_DIR=\"$(libdir)/g++-include\" \
+          -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_prefix)/g++-include\" \
           -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \
          -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
          -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \