[OE-core] [PATCH 2/4] neard: remove libexec hacks

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-connectivity/neard/neard.inc              |   10 +++-------
 meta/recipes-connectivity/neard/neard/neard.in         |    2 +-
 meta/recipes-connectivity/neard/neard/neard.service.in |    2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
index e714cad..59ae9b0 100644
--- a/meta/recipes-connectivity/neard/neard.inc
+++ b/meta/recipes-connectivity/neard/neard.inc
@@ -13,22 +13,18 @@ inherit autotools-brokensep pkgconfig systemd update-rc.d
 
 EXTRA_OECONF += "--enable-tools"
 
-do_install() {
-	oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install
-}
-
 # This would copy neard start-stop shell and test scripts
 do_install_append() {
 	if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
 		install -d ${D}${sysconfdir}/init.d/
-		sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
+		sed "s:@pkglibexecdir@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \
 		  > ${D}${sysconfdir}/init.d/neard
 		chmod 0755 ${D}${sysconfdir}/init.d/neard
 	fi
 
 	if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
 		install -d ${D}${systemd_unitdir}/system
-		sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \
+		sed "s:@pkglibexecdir@:${libexecdir}/nfc:" ${WORKDIR}/neard.service.in \
 		  > ${D}${systemd_unitdir}/system/neard.service
 	fi
 
@@ -41,7 +37,7 @@ do_install_append() {
 PACKAGES =+ "${PN}-tests"
 
 FILES_${PN}-tests = "${libdir}/${BPN}/*-test"
-FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug"
+FILES_${PN}-dbg += "${libexecdir}/nfc/.debug ${libdir}/${BPN}/*/.debug"
 
 RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
 
diff --git a/meta/recipes-connectivity/neard/neard/neard.in b/meta/recipes-connectivity/neard/neard/neard.in
index a47d4d9..c9e72ae 100644
--- a/meta/recipes-connectivity/neard/neard/neard.in
+++ b/meta/recipes-connectivity/neard/neard/neard.in
@@ -12,7 +12,7 @@
 # Description:       neard is a daemon used to enable NFC features
 ### END INIT INFO
 
-DAEMON=@installpath@/neard
+DAEMON=@pkglibexecdir@/neard
 PIDFILE=/var/run/neard.pid
 DESC="Linux NFC daemon"
 
diff --git a/meta/recipes-connectivity/neard/neard/neard.service.in b/meta/recipes-connectivity/neard/neard/neard.service.in
index a6f8a84..458173f 100644
--- a/meta/recipes-connectivity/neard/neard/neard.service.in
+++ b/meta/recipes-connectivity/neard/neard/neard.service.in
@@ -6,7 +6,7 @@ After=syslog.target
 [Service]
 Type=dbus
 BusName=org.neard
-ExecStart=@installpath@/neard -n
+ExecStart=@pkglibexecdir@/neard -n
 
 [Install]
 Alias=dbus-org.neard.service
-- 
1.7.10.4