diff options
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/meson.build b/meson.build index dc1524aa0d..480c56ff88 100644 --- a/meson.build +++ b/meson.build @@ -25,6 +25,12 @@ nm_id_prefix = 'NM' nm_gir_version = '1.0' +# Distribution version string +dist_version = get_option('dist_version') +if dist_version == '' + dist_version = nm_version +endif + nm_prefix = get_option('prefix') nm_bindir = join_paths(nm_prefix, get_option('bindir')) nm_datadir = join_paths(nm_prefix, get_option('datadir')) @@ -45,7 +51,7 @@ nm_pkgincludedir = join_paths(nm_includedir, nm_name) nm_pkglibdir = join_paths(nm_prefix, 'lib', nm_name) nm_pkgrundir = join_paths(nm_runstatedir, nm_name) nm_pkgstatedir = join_paths(nm_localstatedir, nm_name) -nm_plugindir = join_paths(nm_libdir, nm_name) +nm_plugindir = join_paths(nm_libdir, nm_name, dist_version) libnm_name = 'libnm' @@ -259,11 +265,7 @@ if config_plugins_default == '' endif config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default) -# Distribution version string -dist_version = get_option('dist_version') -if dist_version != '' - config_h.set_quoted('NM_DIST_VERSION', dist_version) -endif +config_h.set_quoted('NM_DIST_VERSION', dist_version) enable_wifi = get_option('wifi') config_h.set10('WITH_WIFI', enable_wifi) |