diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-06-22 22:16:01 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-26 14:08:02 +0100 |
| commit | 53c5a6b97f254725ae5d19af4977486ab84d1ea5 (patch) | |
| tree | 1afd793ee1ec31e9aece81fc42254dc4fd4c8f78 /meta/recipes-connectivity | |
| parent | 210c8926405fcf695ec00f5768f29ba198320d6a (diff) | |
| download | openembedded-core-contrib-53c5a6b97f254725ae5d19af4977486ab84d1ea5.tar.gz | |
bluez5: fix lib/libexecdir confusion
Use $libexecdir and $libdir as appropriate so the files are packaged correctly
when libexecdir != $libdir/$BPN.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index ae9402f867..0fe5be5ba5 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -66,13 +66,13 @@ ALLOW_EMPTY_libasound-module-bluez = "1" PACKAGES =+ "libasound-module-bluez ${PN}-testtools ${PN}-obex ${PN}-noinst-tools" FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" -FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" +FILES_${PN} += "${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" FILES_${PN}-dev += "\ ${libdir}/bluetooth/plugins/*.la \ ${libdir}/alsa-lib/*.la \ " -FILES_${PN}-obex = "${libdir}/bluez5/bluetooth/obexd \ +FILES_${PN}-obex = "${libexecdir}/bluetooth/obexd \ ${exec_prefix}/lib/systemd/user/obex.service \ ${datadir}/dbus-1/services/org.bluez.obex.service \ " @@ -91,7 +91,7 @@ def get_noinst_tools_paths (d, bb, tools): FILES_${PN}-noinst-tools = "${@get_noinst_tools_paths(d, bb, d.getVar('NOINST_TOOLS', True))}" FILES_${PN}-dbg += "\ - ${libdir}/${BPN}/bluetooth/.debug \ + ${libexecdir}/bluetooth/.debug \ ${libdir}/bluetooth/plugins/.debug \ ${libdir}/*/.debug \ */udev/.debug \ |