Diff between 11ac67844694ae9c91cebdfd0fe4e0b403375d72 and 78bce480093799c287ac8561b9407fa48796a130

Changed Files

File Additions Deletions Status
Makefile.am +2 -2 modified
obexd/src/obex.service.in +1 -1 modified
src/bluetooth.service.in +1 -1 modified
tools/bluetooth-logger.service.in +1 -1 modified

Full Patch

diff --git a/Makefile.am b/Makefile.am
index 3f613a6..d4f4572 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@ CLEANFILES =
 
 EXTRA_DIST =
 
-libexecdir = @libexecdir@/bluetooth
+pkglibexecdir = @libexecdir@/bluetooth
 
 libexec_PROGRAMS =
 
@@ -490,7 +490,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 bca3aef..fc0dce9 100644
--- a/obexd/src/obex.service.in
+++ b/obexd/src/obex.service.in
@@ -4,7 +4,7 @@ Description=Bluetooth OBEX service
 [Service]
 Type=dbus
 BusName=org.bluez.obex
-ExecStart=@libexecdir@/obexd
+ExecStart=@pkglibexecdir@/obexd
 
 [Install]
 Alias=dbus-org.bluez.obex.service
diff --git a/src/bluetooth.service.in b/src/bluetooth.service.in
index f799f65..f9faaa4 100644
--- a/src/bluetooth.service.in
+++ b/src/bluetooth.service.in
@@ -6,7 +6,7 @@ ConditionPathIsDirectory=/sys/class/bluetooth
 [Service]
 Type=dbus
 BusName=org.bluez
-ExecStart=@libexecdir@/bluetoothd
+ExecStart=@pkglibexecdir@/bluetoothd
 NotifyAccess=main
 #WatchdogSec=10
 #Restart=on-failure
diff --git a/tools/bluetooth-logger.service.in b/tools/bluetooth-logger.service.in
index 026a2f1..0090027 100644
--- a/tools/bluetooth-logger.service.in
+++ b/tools/bluetooth-logger.service.in
@@ -4,7 +4,7 @@ ConditionPathIsDirectory=/sys/class/bluetooth
 
 [Service]
 Type=simple
-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