diff options
author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-09-29 18:22:05 +0000 |
---|---|---|
committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-09-29 18:22:05 +0000 |
commit | 759d75c321eba9440946d84e762a9a76a07109ec (patch) | |
tree | 4d2a111087922db4e2d3a161f724d700753b2f5a /gcc/configure | |
parent | 54f5cbc428090696115bff18507847f6ac3d4090 (diff) | |
download | gcc-759d75c321eba9440946d84e762a9a76a07109ec.tar.gz |
* cppdefault.c (cpp_include_defaults): Also search PREFIX_INCLUDE_DIR.
* Makefile.in (includedir): Rename to local_includedir.
(includedir): Define as $(prefix)/include.
* config.in (PREFIX_INCLUDE_DIR): New variable.
* configure.in (PREFIX_INCLUDE_DIR): Test for new variable.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45884 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/configure')
-rwxr-xr-x | gcc/configure | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gcc/configure b/gcc/configure index 2f5a3ef497a..8996049dc89 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2057,7 +2057,7 @@ EOF fi # Find some useful tools -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7426,6 +7426,13 @@ EOF fi echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6 +if test "$prefix" != "/usr" && test "$prefix" != "/usr/local" ; then + cat >> confdefs.h <<EOF +#define PREFIX_INCLUDE_DIR "$prefix/include" +EOF + +fi + # Figure out what language subdirectories are present. # Look if the user specified --enable-languages="..."; if not, use # the environment variable $LANGUAGES if defined. $LANGUAGES might @@ -7556,7 +7563,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:7560: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:7567: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" |