mirror of
https://git.kernel.org/pub/scm/bluetooth/bluez.git
synced 2024-11-15 00:04:29 +08:00
build: Use libexecdir for Bluetooth daemon
This commit is contained in:
parent
27c68b2d98
commit
5a2fda0be9
13
Makefile.am
13
Makefile.am
@ -9,8 +9,6 @@ noinst_LTLIBRARIES =
|
||||
|
||||
bin_PROGRAMS =
|
||||
|
||||
sbin_PROGRAMS =
|
||||
|
||||
libexec_PROGRAMS =
|
||||
|
||||
noinst_PROGRAMS =
|
||||
@ -52,6 +50,8 @@ systemdunit_DATA = src/bluetooth.service
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_DIST += src/bluetooth.service.in
|
||||
|
||||
plugindir = $(libdir)/bluetooth/plugins
|
||||
|
||||
if MAINTAINER_MODE
|
||||
@ -131,7 +131,7 @@ plugins_external_dummy_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \
|
||||
plugins_external_dummy_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden
|
||||
endif
|
||||
|
||||
sbin_PROGRAMS += src/bluetoothd
|
||||
libexec_PROGRAMS += src/bluetoothd
|
||||
|
||||
src_bluetoothd_SOURCES = $(gdbus_sources) $(builtin_sources) \
|
||||
$(attrib_sources) $(btio_sources) \
|
||||
@ -263,6 +263,13 @@ MAINTAINERCLEANFILES = Makefile.in \
|
||||
aclocal.m4 configure config.h.in config.sub config.guess \
|
||||
ltmain.sh depcomp compile missing install-sh mkinstalldirs
|
||||
|
||||
SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
|
||||
$(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
|
||||
< $< > $@
|
||||
|
||||
%.service: %.service.in Makefile
|
||||
$(SED_PROCESS)
|
||||
|
||||
src/builtin.h: src/genbuiltin $(builtin_sources)
|
||||
$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
|
||||
|
||||
|
@ -15,7 +15,6 @@ fi
|
||||
--mandir=/usr/share/man \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--libexecdir=/lib \
|
||||
--enable-health \
|
||||
--enable-tools \
|
||||
--enable-hid2hci \
|
||||
|
@ -54,4 +54,4 @@ if (test -n "${path_systemdunit}"); then
|
||||
fi
|
||||
AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
|
||||
|
||||
AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc)
|
||||
AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 bluez.pc)
|
||||
|
@ -4,7 +4,7 @@ Description=Bluetooth service
|
||||
[Service]
|
||||
Type=dbus
|
||||
BusName=org.bluez
|
||||
ExecStart=@prefix@/sbin/bluetoothd -n
|
||||
ExecStart=@libexecdir@/bluetoothd -n
|
||||
StandardOutput=null
|
||||
|
||||
[Install]
|
||||
|
Loading…
Reference in New Issue
Block a user