diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-03 21:10:20 -0300 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-03 21:10:20 -0300 |
| commit | f16e9d281458a62da986a454522a58d9947bfd76 (patch) | |
| tree | d0a0a46af38639c9244f6c722909051d1b2cb0a4 /console-client/xkb/compose.c | |
| parent | 2f4f65ce9137aab6acaf1004bacc09d3a975d881 (diff) | |
| parent | 11b4ed1bced4e07dac02ec291c65ef4f4de5c01b (diff) | |
| download | hurd-f16e9d281458a62da986a454522a58d9947bfd76.tar.gz hurd-f16e9d281458a62da986a454522a58d9947bfd76.tar.bz2 hurd-f16e9d281458a62da986a454522a58d9947bfd76.zip | |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'console-client/xkb/compose.c')
| -rw-r--r-- | console-client/xkb/compose.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/console-client/xkb/compose.c b/console-client/xkb/compose.c index 65854e14..78bce7ff 100644 --- a/console-client/xkb/compose.c +++ b/console-client/xkb/compose.c @@ -548,7 +548,7 @@ get_compose_file_for_locale() } context.value = setlocale (LC_ALL, NULL); - map_iterate (DATADIR "/X11/locale/locale.alias", match_left_set_right, &context); + map_iterate (X11_PREFIX "/share/X11/locale/locale.alias", match_left_set_right, &context); to_be_freed = context.result; if (context.result != NULL) @@ -557,12 +557,12 @@ get_compose_file_for_locale() context.value = context.result; } context.result = NULL; - map_iterate (DATADIR "/X11/locale/compose.dir", match_right_set_left, &context); + map_iterate (X11_PREFIX "/share/X11/locale/compose.dir", match_right_set_left, &context); free (to_be_freed); /* compose.dir contains relative paths to compose files. */ to_be_freed = context.result; - err = asprintf (&context.result, DATADIR "/X11/locale/%s", context.result); + err = asprintf (&context.result, X11_PREFIX "/share/X11/locale/%s", context.result); if (err == -1) context.result = NULL; |