build: rename libexecdir to pkglibexecdir

When files are to be placed not in libexecdir but a subdirectory of
it, automake has a variable name reserved for exactly that purpose
(and a default value, which Makefile.am will override), called
pkglibexecdir. Let's use it.

Change-Id: I8b4e271814ab998a7eccaf5c3c2ac3ddc539a6df
Signed-off-by: himanshu <h.himanshu@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index c92a89f..2174444 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ CLEANFILES =
 
 EXTRA_DIST =
 
-libexecdir = @libexecdir@/bluetooth
+pkglibexecdir = @libexecdir@/bluetooth
 
 libexec_PROGRAMS =
 
@@ -600,7 +600,7 @@ MAINTAINERCLEANFILES = Makefile.in \
        ltmain.sh depcomp compile missing install-sh mkinstalldirs test-driver
 
 SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-               $(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
+               $(SED) -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                < $< > $@
 
 %.service: %.service.in Makefile

diff --git a/obexd/src/obex.service.in b/obexd/src/obex.service.in
index 2c110aa..aa2e6aa 100755 (executable)
--- a/obexd/src/obex.service.in
+++ b/obexd/src/obex.service.in
@@ -8,7 +8,7 @@ SmackProcessLabel=System
 SupplementaryGroups=priv_mediastorage priv_externalstorage
 Type=dbus
 BusName=org.bluez.obex
-ExecStart=@libexecdir@/obexd -d --noplugin=ftp,syncevolution,pcsuite,irmc --symlinks -r /opt/usr/home/owner/media/
+ExecStart=@pkglibexecdir@/obexd -d --noplugin=ftp,syncevolution,pcsuite,irmc --symlinks -r /opt/usr/home/owner/media/
 
 [Install]
 Alias=dbus-org.bluez.obex.service

diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
index 50531d8..9b31421 100755 (executable)
--- a/src/bluetooth.service.in
+++ b/src/bluetooth.service.in
@@ -7,7 +7,7 @@ User=network_fw
 Group=network_fw
 Type=dbus
 BusName=org.bluez
-ExecStart=/usr/libexec/bluetooth/bluetoothd -d -C
+ExecStart=@pkglibexecdir@/bluetoothd -d -C
 Capabilities=cap_net_admin,cap_net_bind_service,cap_dac_override=eip
 SecureBits=keep-caps
 SmackProcessLabel=System

diff --git a/tools/bluetooth-logger.service.in b/tools/bluetooth-logger.service.in
index bad1532..3a83640 100644 (file)
--- a/tools/bluetooth-logger.service.in
+++ b/tools/bluetooth-logger.service.in
@@ -3,7 +3,7 @@ Description=Bluetooth monitor logger
 ConditionPathIsDirectory=/sys/class/bluetooth
 
 [Service]
-ExecStart=@libexecdir@/btmon-logger -p -b /var/log/bluetooth/hci.log
+ExecStart=@pkglibexecdir@/btmon-logger -p -b /var/log/bluetooth/hci.log
 NotifyAccess=main
 CapabilityBoundingSet=CAP_NET_RAW
 LimitNPROC=1