meson: distinguish arch specific and arch neutral lib dir

Plugins go to the arch specific place while conf.d/ and VPN/ are in
lib/. Use the same naming as is used with autoconf.

libnm-core/meson.build

@@ -141,7 +141,7 @@ cflags = [
   '-DLOCALEDIR="@0@"'.format(nm_localedir),
   '-DNMCONFDIR="@0@"'.format(nm_pkgconfdir),
   '-DNMLIBDIR="@0@"'.format(nm_pkglibdir),
-  '-DNMPLUGINDIR="@0@"'.format(nm_pkglibdir)
+  '-DNMPLUGINDIR="@0@"'.format(nm_plugindir)
 ]
 
 if enable_json_validation

libnm-glib/meson.build

@@ -287,7 +287,7 @@ pkg.generate(
   variables: [
     'exec_prefix=${prefix}',
     'libgnome_serverdir=' + nm_libexecdir,
-    'plugindir=' + nm_pkglibdir,
+    'plugindir=' + nm_plugindir,
     'configdir=' + nm_pkgconfdir
   ]
 )

meson.build

@@ -42,9 +42,10 @@ nm_pkgsbindir = join_paths(nm_sbindir, nm_name)
 nm_pkgconfdir = join_paths(nm_sysconfdir, nm_name)
 nm_pkgdatadir = join_paths(nm_datadir, nm_name)
 nm_pkgincludedir = join_paths(nm_includedir, nm_name)
-nm_pkglibdir = join_paths(nm_libdir, 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)
 
 libnm_name = 'libnm'
 
@@ -886,6 +887,7 @@ output += '  nmlibdir: ' + nm_pkglibdir + '\n'
 output += '  nmdatadir: ' + nm_pkgdatadir + '\n'
 output += '  nmstatedir: ' + nm_pkgstatedir + '\n'
 output += '  nmrundir: ' + nm_pkgrundir + '\n'
+output += '  nmplugindir: ' + nm_plugindir + '\n'
 output += '\nPlatform:\n'
 output += '  session tracking: ' + ','.join(session_trackers) + '\n'
 output += '  suspend/resume: ' + suspend_resume + '\n'

src/devices/adsl/meson.build

@@ -15,7 +15,7 @@ libnm_device_plugin_adsl = shared_module(
   link_args: ldflags_linker_script_devices,
   link_depends: linker_script_devices,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_device_plugin_adsl

src/devices/bluetooth/meson.build

@@ -26,7 +26,7 @@ libnm_device_plugin_bluetooth = shared_module(
   link_args: ldflags_linker_script_devices,
   link_depends: linker_script_devices,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_device_plugin_bluetooth

src/devices/ovs/meson.build

@@ -19,7 +19,7 @@ libnm_device_plugin_ovs = shared_module(
   link_args: ldflags_linker_script_devices,
   link_depends: linker_script_devices,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_device_plugin_ovs

src/devices/team/meson.build

@@ -16,7 +16,7 @@ libnm_device_plugin_team = shared_module(
   link_args: ldflags_linker_script_devices,
   link_depends: linker_script_devices,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_device_plugin_team

src/devices/wifi/meson.build

@@ -28,7 +28,7 @@ libnm_device_plugin_wifi = shared_module(
   link_args: ldflags_linker_script_devices,
   link_depends: linker_script_devices,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_device_plugin_wifi

src/devices/wwan/meson.build

@@ -25,7 +25,7 @@ libnm_wwan = shared_module(
   ],
   link_depends: linker_script,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 libnm_wwan_dep = declare_dependency(
@@ -54,7 +54,7 @@ libnm_device_plugin_wwan = shared_module(
   link_args: ldflags_linker_script_devices,
   link_depends: linker_script_devices,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_device_plugin_wwan

src/meson.build

@@ -29,7 +29,7 @@ cflags = nm_cflags + [
   '-DRUNDIR="@0@"'.format(nm_pkgrundir),
   '-DNMCONFDIR="@0@"'.format(nm_pkgconfdir),
   '-DNMLOCALEDIR="@0@"'.format(nm_localedir),
-  '-DNMPLUGINDIR="@0@"'.format(nm_pkglibdir),
+  '-DNMPLUGINDIR="@0@"'.format(nm_plugindir),
   '-DNMRUNDIR="@0@"'.format(nm_pkgrundir),
   '-DNMSTATEDIR="@0@"'.format(nm_pkgstatedir),
   '-DNMLIBDIR="@0@"'.format(nm_pkglibdir)

src/ppp/meson.build

@@ -37,5 +37,5 @@ core_plugins += shared_module(
   ],
   link_depends: linker_script,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )

src/settings/plugins/ibft/meson.build

@@ -26,7 +26,7 @@ libnm_settings_plugin_ibft = shared_module(
   link_args: ldflags_linker_script_settings,
   link_depends: linker_script_settings,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_settings_plugin_ibft

src/settings/plugins/ifcfg-rh/meson.build

@@ -55,7 +55,7 @@ libnm_settings_plugin_ifcfg_rh = shared_module(
   link_args: ldflags_linker_script_settings,
   link_depends: linker_script_settings,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_settings_plugin_ifcfg_rh

src/settings/plugins/ifupdown/meson.build

@@ -31,7 +31,7 @@ libnm_settings_plugin_ifupdown = shared_module(
   link_args: ldflags_linker_script_settings,
   link_depends: linker_script_settings,
   install: true,
-  install_dir: nm_pkglibdir
+  install_dir: nm_plugindir
 )
 
 core_plugins += libnm_settings_plugin_ifupdown