2002-04-02 David O'Brien <obrien@FreeBSD.org>

	* protoize.c: Match include directory usage with cppdefault.c.

Approved by:  Richard Henderson <rth@redhat.com>
              Message-ID: <20020329131400.C19829@redhat.com>

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51787 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ed2f083..a115678 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-02  David O'Brien  <obrien@FreeBSD.org>
+
+       * protoize.c: Match include directory usage with cppdefault.c.
+
 2002-04-03  Jeffrey A Law  (law@redhat.com)
             Hans-Peter Nilsson  <hp@bitrange.com>
 

diff --git a/gcc/protoize.c b/gcc/protoize.c
index f8d8a9e..25c7933 100644 (file)
--- a/gcc/protoize.c
+++ b/gcc/protoize.c
@@ -197,14 +197,6 @@ static const int hash_mask = (HASH_TABLE_SIZE - 1);
 /* Make a table of default system include directories
    just as it is done in cpp.  */
 
-#ifndef STANDARD_INCLUDE_DIR
-#define STANDARD_INCLUDE_DIR "/usr/include"
-#endif
-
-#ifndef LOCAL_INCLUDE_DIR
-#define LOCAL_INCLUDE_DIR "/usr/local/include"
-#endif
-
 static const struct default_include { const char *const fname; 
                         const char *const component;
                         const int x1, x2; } include_defaults[]
@@ -215,29 +207,43 @@ static const struct default_include { const char *const fname;
     /* Pick up GNU C++ specific include files.  */
     { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },
 #ifdef CROSS_COMPILE
+#ifdef GCC_INCLUDE_DIR
     /* This is the dir for fixincludes.  Put it just before
        the files that we fix.  */
     { GCC_INCLUDE_DIR, "GCC", 0, 0 },
+#endif
+#ifdef CROSS_INCLUDE_DIR
     /* For cross-compilation, this dir name is generated
        automatically in Makefile.in.  */
     { CROSS_INCLUDE_DIR, 0, 0, 0 },
+#endif
+#ifdef TOOL_INCLUDE_DIR
     /* This is another place that the target system's headers might be.  */
     { TOOL_INCLUDE_DIR, "BINUTILS", 0, 0 },
+#endif
 #else /* not CROSS_COMPILE */
+#ifdef LOCAL_INCLUDE_DIR
     /* This should be /use/local/include and should come before
        the fixincludes-fixed header files.  */
     { LOCAL_INCLUDE_DIR, 0, 0, 1 },
+#endif
+#ifdef TOOL_INCLUDE_DIR
     /* This is here ahead of GCC_INCLUDE_DIR because assert.h goes here.
        Likewise, behind LOCAL_INCLUDE_DIR, where glibc puts its assert.h.  */
     { TOOL_INCLUDE_DIR, "BINUTILS", 0, 0 },
+#endif
+#ifdef GCC_INCLUDE_DIR
     /* This is the dir for fixincludes.  Put it just before
        the files that we fix.  */
     { GCC_INCLUDE_DIR, "GCC", 0, 0 },
+#endif
     /* Some systems have an extra dir of include files.  */
 #ifdef SYSTEM_INCLUDE_DIR
     { SYSTEM_INCLUDE_DIR, 0, 0, 0 },
 #endif
+#ifdef STANDARD_INCLUDE_DIR
     { STANDARD_INCLUDE_DIR, 0, 0, 0},
+#endif
 #endif /* not CROSS_COMPILE */
     { 0, 0, 0, 0}
     };