Skip to content
Browse files

Move hid2hci to /lib/udev

  • Loading branch information...
1 parent e6c56d4 commit 9fc7474d89de7a3095e9f3d2f3db85ff0c4d1cd2 @kaysievers kaysievers committed with Johan Hedberg Apr 29, 2011
Showing with 8 additions and 8 deletions.
  1. +1 −1 Makefile.am
  2. +3 −1 Makefile.tools
  3. +4 −6 acinclude.m4
View
2 Makefile.am
@@ -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
View
4 Makefile.tools
@@ -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@
View
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], [

0 comments on commit 9fc7474

Please sign in to comment.
Something went wrong with that request. Please try again.