summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-05-30 10:51:23 +0200
committerThomas Haller <thaller@redhat.com>2018-05-31 15:59:38 +0200
commite5d1a71396e107d1909744d26ad401f206c0c915 (patch)
treeaf289054ed49064547d7f0f59dc63e0d7d5d2f7f
parent82b088ab5f8b619cbbd187d1906e196deaf759ef (diff)
downloadNetworkManager-e5d1a71396e107d1909744d26ad401f206c0c915.tar.gz
build: unifiy specifying locale directory define
-rw-r--r--Makefile.am16
-rw-r--r--clients/cli/meson.build2
-rw-r--r--clients/cli/nmcli.c2
-rw-r--r--clients/tui/meson.build2
-rw-r--r--clients/tui/nmtui.c2
-rw-r--r--libnm-core/meson.build2
-rw-r--r--libnm-core/nm-utils.c2
-rw-r--r--libnm-util/meson.build2
-rw-r--r--libnm-util/nm-utils.c2
9 files changed, 17 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index a16501007c..d769fecc50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,6 +81,8 @@ servicedir = $(datadir)/dbus-1/system-services
completiondir = $(datadir)/bash-completion/completions
+nmlocaledir = $(datadir)/locale
+
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
@@ -577,7 +579,7 @@ libnm_core_libnm_core_la_CPPFLAGS = \
$(dflt_cppflags_libnm_core) \
-DG_LOG_DOMAIN=\""libnm"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
- -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DNMLOCALEDIR=\"$(nmlocaledir)\" \
-DNMCONFDIR=\"$(nmconfdir)\" \
-DNMLIBDIR=\"$(nmlibdir)\" \
-DNMVPNDIR=\"$(pkglibdir)\" \
@@ -1192,7 +1194,7 @@ src_cppflags = \
-DRUNDIR=\"$(rundir)\" \
\
-DNMCONFDIR=\"$(nmconfdir)\" \
- -DNMLOCALEDIR=\"$(datadir)/locale\" \
+ -DNMLOCALEDIR=\"$(nmlocaledir)\" \
-DNMPLUGINDIR=\"$(plugindir)\" \
-DNMRUNDIR=\"$(nmrundir)\" \
-DNMSTATEDIR=\"$(nmstatedir)\" \
@@ -3360,7 +3362,7 @@ clients_nm_online_CPPFLAGS = \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""nm-online"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
- -DNMLOCALEDIR=\"$(datadir)/locale\"
+ -DNMLOCALEDIR=\"$(nmlocaledir)\"
clients_nm_online_LDFLAGS = \
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
@@ -3388,7 +3390,7 @@ clients_cppflags = \
-I$(srcdir)/clients/common \
-I$(builddir)/clients/common \
$(GLIB_CFLAGS) \
- -DNMLOCALEDIR=\"$(datadir)/locale\" \
+ -DNMLOCALEDIR=\"$(nmlocaledir)\" \
$(NULL)
check_ltlibraries += clients/common/libnmc-base.la
@@ -3542,7 +3544,7 @@ clients_cli_nmcli_CPPFLAGS = \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DG_LOG_DOMAIN=\""nmcli"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
- -DNMCLI_LOCALEDIR=\"$(datadir)/locale\"
+ -DNMLOCALEDIR=\"$(nmlocaledir)\"
clients_cli_nmcli_LDADD = \
libnm/libnm.la \
@@ -3748,7 +3750,7 @@ clients_tui_nmtui_CPPFLAGS = \
$(NEWT_CFLAGS) \
-DG_LOG_DOMAIN=\""nmtui"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
- -DLOCALEDIR=\""$(localedir)"\"
+ -DNMLOCALEDIR=\""$(localedir)"\"
clients_tui_nmtui_LDFLAGS = \
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
@@ -3909,7 +3911,7 @@ libnm_util_cppflags = \
-I$(builddir)/shared \
-DG_LOG_DOMAIN=\""libnm-util"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
- -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DNMLOCALEDIR=\"$(nmlocaledir)\" \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(UUID_CFLAGS)
diff --git a/clients/cli/meson.build b/clients/cli/meson.build
index b7f5e19360..9449ce63c0 100644
--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@@ -29,7 +29,7 @@ deps = [
cflags = clients_cflags + [
'-DSYSCONFDIR="@0@"'.format(nm_sysconfdir),
'-DG_LOG_DOMAIN="@0@"'.format(name),
- '-DNMCLI_LOCALEDIR="@0@"'.format(nm_localedir)
+ '-DNMLOCALEDIR="@0@"'.format(nm_localedir)
]
if enable_polkit_agent
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 24fa37c638..e9752952d5 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -950,7 +950,7 @@ main (int argc, char *argv[])
#ifdef GETTEXT_PACKAGE
/* Set i18n stuff */
- bindtextdomain (GETTEXT_PACKAGE, NMCLI_LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#endif
diff --git a/clients/tui/meson.build b/clients/tui/meson.build
index dd472998da..40eb4b4ac7 100644
--- a/clients/tui/meson.build
+++ b/clients/tui/meson.build
@@ -7,7 +7,7 @@ deps = [
cflags = clients_cflags + [
'-DG_LOG_DOMAIN="@0@"'.format(name),
- '-DLOCALEDIR="@0@"'.format(nm_localedir)
+ '-DNMLOCALEDIR="@0@"'.format(nm_localedir)
]
subdir('newt')
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index f6994f69fc..97c528e705 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -226,7 +226,7 @@ main (int argc, char **argv)
int i;
setlocale (LC_ALL, "");
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index 9d49edaeb8..71557f8a71 100644
--- a/libnm-core/meson.build
+++ b/libnm-core/meson.build
@@ -138,7 +138,7 @@ cflags = [
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
'-DLIBEXECDIR="@0@"'.format(nm_libexecdir),
- '-DLOCALEDIR="@0@"'.format(nm_localedir),
+ '-DNMLOCALEDIR="@0@"'.format(nm_localedir),
'-DNMCONFDIR="@0@"'.format(nm_pkgconfdir),
'-DNMLIBDIR="@0@"'.format(nm_pkglibdir),
'-DNMPLUGINDIR="@0@"'.format(nm_plugindir),
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index c5af2e33e1..eb65f8db7d 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -249,7 +249,7 @@ _nm_utils_init (void)
g_error ("libnm-util symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported");
g_module_close (self);
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
_nm_dbus_errors_init ();
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index b385e32b85..5d17a4ddaa 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -101,7 +101,7 @@ deps = [
common_cflags = [
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL',
- '-DLOCALEDIR="@0@"'.format(nm_localedir),
+ '-DNMLOCALEDIR="@0@"'.format(nm_localedir),
]
cflags = common_cflags + [
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 54e0cc9a82..2af9432fee 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -232,7 +232,7 @@ nm_utils_init (GError **error)
if (!initialized) {
initialized = TRUE;
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
if (!crypto_init (error))