X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flocale-setup.c;fp=src%2Flocale-setup.c;h=d9adfa33f491c4b8e8d5798de40f805e9dde75c8;hb=54e4fdef80693f7fd7893bd048bb4d9a258b03a6;hp=08e289d4eed6c57a62965118286382a79e4d33cb;hpb=05677bb78079c3fa0283101aac2c07581f4873f1;p=elogind.git diff --git a/src/locale-setup.c b/src/locale-setup.c index 08e289d4e..d9adfa33f 100644 --- a/src/locale-setup.c +++ b/src/locale-setup.c @@ -71,7 +71,7 @@ int locale_setup(void) { if (detect_container(NULL) <= 0) if ((r = parse_env_file("/proc/cmdline", WHITESPACE, -#ifdef TARGET_FEDORA +#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO) "LANG", &variables[VARIABLE_LANG], #endif "locale.LANG", &variables[VARIABLE_LANG], @@ -116,7 +116,7 @@ int locale_setup(void) { log_warning("Failed to read /etc/locale.conf: %s", strerror(-r)); } -#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) +#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MEEGO) if (r <= 0 && (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, "LANG", &variables[VARIABLE_LANG],