Changeset 917 for trunk/src/gmakenew/read.c

Timestamp:

May 25, 2007, 12:39:22 AM (18 years ago)

Author:

bird

Message:

PATH_KBUILD and PATH_KBUILD_BIN improvements. Avoid LOCALEDIR, ALIASDIR, LIBDIR and INCLUDEDIR.

File:

• trunk/src/gmakenew/read.c (modified) (6 diffs)

trunk/src/gmakenew/read.c

@@ -31 +31 @@
 #include "debug.h"
 #include "hash.h"
+#ifdef KMK
+# include "kbuild.h"
+#endif
 
 
@@ -91 +94 @@
 static const char *default_include_directories[] =
   {
+#ifndef KMK
 #if defined(WINDOWS32) && !defined(INCLUDEDIR)
 /* This completely up to the user when they install MSVC or other packages.
@@ -102 +106 @@
     "/usr/include",
 #endif
+#endif /* !KMK */
     0
   };
@@ -3006 +3011 @@
   ++idx;
 #endif
+#ifdef KMK
+  /* Add one for the kBuild directory. */
+  ++idx;
+#endif
 
   dirs = xmalloc (idx * sizeof (const char *));
@@ -3064 +3073 @@
           max_incl_len = len;
       }
+  }
+#endif
+#ifdef KMK
+  /* Add $(PATH_KBUILD). */
+  {
+    size_t len = strlen (get_path_kbuild ());
+    dirs[idx++] = strcache_add_len (get_path_kbuild (), len);
+    if (len > max_incl_len)
+      max_incl_len = len;
   }
 #endif
@@ -3226 +3244 @@
         {
           gl.gl_pathc = 1;
-          gl.gl_pathv = (char *)&gname;
+          gl.gl_pathv = (char **)&gname;
           rc = 0;
         }