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.

14 files changed, 17 insertions, 15 deletions

diff --git a/libnm-core/meson.build b/libnm-core/meson.build
index bba844069c..135f363f35 100644
--- a/libnm-core/meson.build
+++ b/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
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build
index eddf983e49..3fc14d547d 100644
--- a/libnm-glib/meson.build
+++ b/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
   ]
 )
diff --git a/meson.build b/meson.build
index 994916778a..dc1524aa0d 100644
--- a/meson.build
+++ b/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'
diff --git a/src/devices/adsl/meson.build b/src/devices/adsl/meson.build
index 4b0fade01a..ee804d2387 100644
--- a/src/devices/adsl/meson.build
+++ b/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
diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build
index eb200679f5..30284f9e0f 100644
--- a/src/devices/bluetooth/meson.build
+++ b/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
diff --git a/src/devices/ovs/meson.build b/src/devices/ovs/meson.build
index 7b1c461746..f4edd57c00 100644
--- a/src/devices/ovs/meson.build
+++ b/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
diff --git a/src/devices/team/meson.build b/src/devices/team/meson.build
index 4a533bc5cd..159c182a2e 100644
--- a/src/devices/team/meson.build
+++ b/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
diff --git a/src/devices/wifi/meson.build b/src/devices/wifi/meson.build
index 27eaeea63f..a27f8e6a03 100644
--- a/src/devices/wifi/meson.build
+++ b/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
diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build
index 032b35853f..abf585946a 100644
--- a/src/devices/wwan/meson.build
+++ b/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
diff --git a/src/meson.build b/src/meson.build
index 591c9c79c1..e60ab93fb9 100644
--- a/src/meson.build
+++ b/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)
diff --git a/src/ppp/meson.build b/src/ppp/meson.build
index 20edb9d055..38f9a0f140 100644
--- a/src/ppp/meson.build
+++ b/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
 )
diff --git a/src/settings/plugins/ibft/meson.build b/src/settings/plugins/ibft/meson.build
index da9f556687..1b6ff28adc 100644
--- a/src/settings/plugins/ibft/meson.build
+++ b/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
diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build
index fdf308be09..964ce22db6 100644
--- a/src/settings/plugins/ifcfg-rh/meson.build
+++ b/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
diff --git a/src/settings/plugins/ifupdown/meson.build b/src/settings/plugins/ifupdown/meson.build
index 87b5bea2d1..fd028f4d3e 100644
--- a/src/settings/plugins/ifupdown/meson.build
+++ b/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