[network-manager-applet] build: rename version defines after libnma split

[Thomas Haller <thaller src gnome org>]

commit 42438474d066c2a2d111188ee2fd9e3053fc3f9b
Author: Thomas Haller <thaller redhat com>
Date:   Fri Mar 6 23:02:57 2020 +0100

    build: rename version defines after libnma split

 configure.ac    | 12 ++++++------
 man/meson.build |  2 +-
 meson.build     | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0d8cb6ae..eb3f03d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
 AC_PREREQ([2.63])
 
-m4_define([nma_major_version], [1])
-m4_define([nma_minor_version], [15])
-m4_define([nma_micro_version], [0])
-m4_define([nma_version],
-          [nma_major_version.nma_minor_version.nma_micro_version])
+m4_define([nm_applet_major_version], [1])
+m4_define([nm_applet_minor_version], [15])
+m4_define([nm_applet_micro_version], [0])
+m4_define([nm_applet_version],
+          [nm_applet_major_version.nma_minor_version.nma_micro_version])
 
 AC_INIT([nm-applet],
-        [nma_version],
+        [nm_applet_version],
         [https://gitlab.gnome.org/GNOME/network-manager-applet/issues],
         [network-manager-applet])
 
diff --git a/man/meson.build b/man/meson.build
index 22a123ee..574a113f 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -6,7 +6,7 @@ mans = [
 man1_dir = join_paths(nma_mandir, 'man1')
 
 man_subst = configuration_data()
-man_subst.set('VERSION', nma_version)
+man_subst.set('VERSION', nm_applet_version)
 
 foreach man: mans
   configure_file(
diff --git a/meson.build b/meson.build
index 0823ede0..eeadd4c2 100644
--- a/meson.build
+++ b/meson.build
@@ -11,11 +11,11 @@ project(
 
 nma_name = 'nm-applet'
 
-nma_version = meson.project_version()
-version_array = nma_version.split('.')
-nma_major_version = version_array[0].to_int()
-nma_minor_version = version_array[1].to_int()
-nma_micro_version = version_array[2].to_int()
+nm_applet_version = meson.project_version()
+version_array = nm_applet_version.split('.')
+nm_applet_major_version = version_array[0].to_int()
+nm_applet_minor_version = version_array[1].to_int()
+nm_applet_micro_version = version_array[2].to_int()
 
 nma_gir_version = '1.0'
 nma_gir_prefix = 'NMA'
@@ -47,7 +47,7 @@ config_h = configuration_data()
 
 # defines
 config_h.set_quoted('GETTEXT_PACKAGE', nma_name)
-config_h.set_quoted('VERSION', nma_version)
+config_h.set_quoted('VERSION', nm_applet_version)
 
 # types
 if not cc.has_type('pid_t', prefix: '#include<sys/types.h>')