Changeset View
Changeset View
Standalone View
Standalone View
devel/glib20/files/patch-glib_gutils.c
| --- glib/gutils.c.orig Wed Mar 23 09:55:02 2005 | --- glib/gutils.c.orig 2020-05-20 10:46:43 UTC | ||||
| +++ glib/gutils.c Thu Apr 7 01:06:16 2005 | +++ glib/gutils.c | ||||
| @@ -1929,7 +1929,7 @@ g_get_system_data_dirs (void) | @@ -2497,7 +2497,7 @@ g_build_system_data_dirs (void) | ||||
| data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); | */ | ||||
| #ifndef G_OS_WIN32 | |||||
| if (!data_dirs || !data_dirs[0]) | if (!data_dirs || !data_dirs[0]) | ||||
| - data_dirs = "/usr/local/share/:/usr/share/"; | - data_dirs = "/usr/local/share/:/usr/share/"; | ||||
| + data_dirs = "/usr/local/share/"; | + data_dirs = "%%LOCALBASE%%/share/:/usr/share/"; | ||||
| data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); | data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); | ||||
| #endif | #else | ||||
| @@ -1983,7 +1983,7 @@ g_get_system_config_dirs (void) | @@ -2591,7 +2591,7 @@ g_build_system_config_dirs (void) | ||||
| conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS"); | } | ||||
| #else | |||||
| if (!conf_dirs || !conf_dirs[0]) | if (!conf_dirs || !conf_dirs[0]) | ||||
| - conf_dirs = "/etc/xdg"; | - conf_dirs = "/etc/xdg"; | ||||
| + conf_dirs = "/usr/local/etc/xdg:/etc/xdg"; | + conf_dirs = "%%LOCALBASE%%/etc/xdg"; | ||||
| conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); | conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); | ||||
| #endif | #endif | ||||