mirror of
https://git.kernel.org/pub/scm/bluetooth/bluez.git
synced 2024-11-15 08:14:28 +08:00
Move hid2hci to /lib/udev
This commit is contained in:
parent
e6c56d4e71
commit
9fc7474d89
@ -334,7 +334,7 @@ EXTRA_DIST += audio/bluetooth.conf
|
||||
include Makefile.tools
|
||||
|
||||
if UDEVRULES
|
||||
rulesdir = @UDEV_DATADIR@
|
||||
rulesdir = @UDEV_DIR@/rules.d
|
||||
|
||||
udev_files = scripts/bluetooth.rules
|
||||
|
||||
|
@ -100,7 +100,9 @@ EXTRA_DIST += tools/bccmd.8
|
||||
endif
|
||||
|
||||
if HID2HCI
|
||||
sbin_PROGRAMS += tools/hid2hci
|
||||
udevdir = @UDEV_DIR@
|
||||
|
||||
udev_PROGRAMS = tools/hid2hci
|
||||
|
||||
tools_hid2hci_LDADD = @USB_LIBS@ @UDEV_LIBS@
|
||||
|
||||
|
10
acinclude.m4
10
acinclude.m4
@ -84,13 +84,11 @@ AC_DEFUN([AC_INIT_BLUEZ], [
|
||||
AC_SUBST(CONFIGDIR, "${configdir}")
|
||||
AC_SUBST(STORAGEDIR, "${storagedir}")
|
||||
|
||||
UDEV_DATADIR="`$PKG_CONFIG --variable=udevdir udev`"
|
||||
if (test -z "${UDEV_DATADIR}"); then
|
||||
UDEV_DATADIR="${sysconfdir}/udev/rules.d"
|
||||
else
|
||||
UDEV_DATADIR="${UDEV_DATADIR}/rules.d"
|
||||
UDEV_DIR="`$PKG_CONFIG --variable=udevdir udev`"
|
||||
if (test -z "${UDEV_DIR}"); then
|
||||
UDEV_DIR="/lib/udev"
|
||||
fi
|
||||
AC_SUBST(UDEV_DATADIR)
|
||||
AC_SUBST(UDEV_DIR)
|
||||
])
|
||||
|
||||
AC_DEFUN([AC_PATH_DBUS], [
|
||||
|
Loading…
Reference in New Issue
Block a user