From 8401e9f91d65c3d8d49cf0d2e35d03146354e957 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 5 Jul 2012 17:20:02 -0700 Subject: MeeGo: Remove build support for MeeGo distribution. The MeeGo distribution is still a supported distribution, but will probably not see an updated version of systemd anymore. Most of the development is focussing on Tizen now, and the generic support for building --with-distro=other is more than adequate enough. This patch removes the support as a custom configuration build target in systemd. People who are still building this for the MeeGo distribution should build as "other" distro. --- src/core/locale-setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/locale-setup.c') diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c index aab454e83b..25eb13474a 100644 --- a/src/core/locale-setup.c +++ b/src/core/locale-setup.c @@ -74,7 +74,7 @@ int locale_setup(void) { if (detect_container(NULL) <= 0) if ((r = parse_env_file("/proc/cmdline", WHITESPACE, -#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO) +#if defined(TARGET_FEDORA) "LANG", &variables[VARIABLE_LANG], #endif "locale.LANG", &variables[VARIABLE_LANG], @@ -121,7 +121,7 @@ int locale_setup(void) { log_warning("Failed to read /etc/locale.conf: %s", strerror(-r)); } -#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MEEGO) +#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) if (r <= 0 && (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, "LANG", &variables[VARIABLE_LANG], -- cgit v1.2.3-54-g00ecf