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. --- Makefile.am | 4 ++-- obexd/src/obex.service.in | 2 +- src/bluetooth.service.in | 2 +- tools/bluetooth-logger.service.in | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0ccf393c6..eee70b88b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ CLEANFILES = EXTRA_DIST = -libexecdir = @libexecdir@/bluetooth +pkglibexecdir = @libexecdir@/bluetooth libexec_PROGRAMS = @@ -489,7 +489,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 bca3aef66..fc0dce993 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 f799f65f0..f9faaa452 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 026a2f130..009002731 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 -- 2.19.1
