diff options
| author | Richard Kenner <kenner@gcc.gnu.org> | 1994-03-07 17:41:38 -0500 |
|---|---|---|
| committer | Richard Kenner <kenner@gcc.gnu.org> | 1994-03-07 17:41:38 -0500 |
| commit | 08824e9e248361a6000123a46e88c881e34a39e6 (patch) | |
| tree | edaced816b507626f68b3ccf3eecfd53ac320167 | |
| parent | 42e2194b021cf7d567c399032bb604e8f8e42b68 (diff) | |
| download | gcc-08824e9e248361a6000123a46e88c881e34a39e6.zip gcc-08824e9e248361a6000123a46e88c881e34a39e6.tar.gz gcc-08824e9e248361a6000123a46e88c881e34a39e6.tar.bz2 | |
(gxx_prefix): New; default to $(libdir).
(GPLUSPLUS_INCLUDE_DIR): Change to $(gxx_prefix)/g++-include.
From-SVN: r6709
| -rw-r--r-- | gcc/Makefile.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index be41a89..4e3f263 100644 --- 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)\" \ |