From: Kay Sievers <kay.sievers@vrfy.org>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH] Move hid2hci to /lib/udev
Date: Fri, 29 Apr 2011 00:32:25 +0200 [thread overview]
Message-ID: <1304029945.27065.1.camel@zag> (raw)
>From 6a825582d6a3b1e1c3ed2a7ea6c62c207d45542d Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 29 Apr 2011 00:29:15 +0200
Subject: [PATCH] Move hid2hci to /lib/udev
---
Makefile.am | 2 +-
Makefile.tools | 4 +++-
acinclude.m4 | 10 ++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 9703bf0..552c81d 100644
--- a/Makefile.am
+++ b/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
diff --git a/Makefile.tools b/Makefile.tools
index 1bf21b2..bec10b5 100644
--- a/Makefile.tools
+++ b/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@
diff --git a/acinclude.m4 b/acinclude.m4
index a27cd22..d77937b 100644
--- a/acinclude.m4
+++ b/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], [
--
1.7.4.2
next reply other threads:[~2011-04-28 22:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-28 22:32 Kay Sievers [this message]
2011-05-02 16:26 ` [PATCH] Move hid2hci to /lib/udev Johan Hedberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1304029945.27065.1.camel@zag \
--to=kay.sievers@vrfy.org \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).