2003-02-19 Tor Lillqvist <tml@iki.fi>

Author: tml
Date: 2003-02-19 19:24:14 GMT
2003-02-19  Tor Lillqvist  <tml@iki.fi>

	* pkg.c (add_env_variable_to_list): Use G_SEARCHPATH_SEPARATOR_S
	instead of hardcoded ":".
	(verify_package): Don't use /usr/include on Win32.

diff --git a/ChangeLog b/ChangeLog
index 151b34168930eb89542b105724ff8bacde548171..44201657675997744607af168fcd5ce7c77dd5e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-19  Tor Lillqvist  <tml@iki.fi>
+
+       * pkg.c (add_env_variable_to_list): Use G_SEARCHPATH_SEPARATOR_S
+       instead of hardcoded ":".
+       (verify_package): Don't use /usr/include on Win32.
+
 2003-02-15  Havoc Pennington  <hp@pobox.com>
 
        * pkg.c (verify_package): patch from Nalin to use /usr/lib64 as

diff --git a/pkg.c b/pkg.c
index 6fd936226dbe5c9227332c2af58db05e8068db36..4a913269b90da4ccebb17a94d1e6a7804434c921 100644 (file)
--- a/pkg.c
+++ b/pkg.c
@@ -652,9 +652,7 @@ add_env_variable_to_list (GSList *list, const gchar *env)
   gchar **values;
   gint i;
 
-  /* FIXME: the separator should be a ';' on Windows
-   */
-  values = g_strsplit (env, ":", 0);
+  values = g_strsplit (env, G_SEARCHPATH_SEPARATOR_S, 0);
   for (i = 0; values[i] != NULL; i++)
     {
       list = g_slist_append (list, g_strdup (values[i]));
@@ -787,8 +785,10 @@ verify_package (Package *pkg)
   /* We make a list of system directories that gcc expects so we can remove
    * them.
    */
+#ifndef G_OS_WIN32
   system_directories = g_slist_append (NULL, g_strdup ("/usr/include"));
-  
+#endif
+
   c_include_path = g_getenv ("C_INCLUDE_PATH");
   if (c_include_path != NULL)
     {