diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-30 11:51:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-30 11:51:52 -0400 |
| commit | 2bd52fb107528d459dabd5929794987c01a7270e (patch) | |
| tree | e01842ceb4617c06dee673c2a09dd4707ae33ab8 /src/grp-locale | |
| parent | 1ed649627c5dbf9254f325c8254bfa69c31466c9 (diff) | |
stuff
Diffstat (limited to 'src/grp-locale')
| -rw-r--r-- | src/grp-locale/Makefile | 3 | ||||
| -rw-r--r-- | src/grp-locale/localectl.c | 8 | ||||
| -rw-r--r-- | src/grp-locale/localed.c | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/grp-locale/Makefile b/src/grp-locale/Makefile index b34c066ec2..e6ab4a7f48 100644 --- a/src/grp-locale/Makefile +++ b/src/grp-locale/Makefile @@ -87,4 +87,7 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-localed.service.in +systemd.CPPFLAGS += -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" +systemd.CPPFLAGS += -DSYSTEMD_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-locale/localectl.c b/src/grp-locale/localectl.c index a159f8ed2e..72ac1c0303 100644 --- a/src/grp-locale/localectl.c +++ b/src/grp-locale/localectl.c @@ -27,18 +27,18 @@ #include <systemd/sd-bus.h> -#include "bus-error.h" -#include "shared/bus-util.h" #include "basic/def.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/locale-util.h" -#include "shared/pager.h" #include "basic/set.h" -#include "shared/spawn-polkit-agent.h" #include "basic/strv.h" #include "basic/util.h" #include "basic/virt.h" +#include "sd-bus/bus-error.h" +#include "shared/bus-util.h" +#include "shared/pager.h" +#include "shared/spawn-polkit-agent.h" static bool arg_no_pager = false; static bool arg_ask_password = true; diff --git a/src/grp-locale/localed.c b/src/grp-locale/localed.c index 513413e2b5..7bb7f1cf34 100644 --- a/src/grp-locale/localed.c +++ b/src/grp-locale/localed.c @@ -30,9 +30,6 @@ #include <systemd/sd-bus.h> #include "basic/alloc-util.h" -#include "bus-error.h" -#include "bus-message.h" -#include "shared/bus-util.h" #include "basic/def.h" #include "basic/env-util.h" #include "basic/fd-util.h" @@ -45,6 +42,9 @@ #include "basic/strv.h" #include "basic/user-util.h" #include "basic/util.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-message.h" +#include "shared/bus-util.h" enum { /* We don't list LC_ALL here on purpose. People should be |