diff options
author | Thomas Haller <thaller@redhat.com> | 2018-10-24 10:19:02 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-10-24 10:19:02 +0200 |
commit | b1571e687e3ffa587be43aac819c7625d83f259a (patch) | |
tree | 01dce1f28e10f21bde33464f9485602a88e43582 | |
parent | 8179b23d7617ef913bc2170ab71a36a11280b745 (diff) | |
parent | 4b2dc8826d52e98832c3e8f1af70f83d1e804091 (diff) | |
download | NetworkManager-b1571e687e3ffa587be43aac819c7625d83f259a.tar.gz |
build/meson: merge branch 'esrevinu/master'
https://bugzilla.gnome.org/show_bug.cgi?id=797324
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/68
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/26
-rw-r--r-- | src/devices/bluetooth/meson.build | 3 | ||||
-rw-r--r-- | src/devices/wwan/meson.build | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build index 019f04f6b5..628a3bc802 100644 --- a/src/devices/bluetooth/meson.build +++ b/src/devices/bluetooth/meson.build @@ -26,7 +26,8 @@ libnm_device_plugin_bluetooth = shared_module( link_args: ldflags_linker_script_devices, link_depends: linker_script_devices, install: true, - install_dir: nm_plugindir + install_dir: nm_plugindir, + install_rpath: nm_plugindir ) core_plugins += libnm_device_plugin_bluetooth diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build index 2c0ea5a10c..5fe6e433e4 100644 --- a/src/devices/wwan/meson.build +++ b/src/devices/wwan/meson.build @@ -54,7 +54,8 @@ libnm_device_plugin_wwan = shared_module( link_args: ldflags_linker_script_devices, link_depends: linker_script_devices, install: true, - install_dir: nm_plugindir + install_dir: nm_plugindir, + install_rpath: nm_plugindir ) core_plugins += libnm_device_plugin_wwan |