From 89b3e3b4060086b35d9b45cfdb2ed7843984ed24 Mon Sep 17 00:00:00 2001 From: Richard Kenner Date: Sat, 12 Mar 1994 19:41:22 -0500 Subject: [PATCH] (gxx_include_dir): Replacement for gxx_prefix. From-SVN: r6761 --- gcc/Makefile.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index b0642dd..f75f649 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -155,8 +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 in which the compiler finds g++ includes. +gxx_include_dir= $(libdir)/g++-include # Directory to search for site-specific includes. includedir = $(local_prefix)/include # assertdir is overridden in cross-make. @@ -1402,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=\"$(gxx_prefix)/g++-include\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \ -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \ @@ -1427,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=\"$(gxx_prefix)/g++-include\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \ -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \ -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ @@ -1436,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=\"$(gxx_prefix)/g++-include\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \ -DCROSS_INCLUDE_DIR=\"$(libsubdir)/sys-include\" \ -DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \ -DLOCAL_INCLUDE_DIR=\"$(includedir)\" \ -- 2.7.4