diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-06-30 07:53:08 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-06-30 07:53:08 -0700 |
| commit | c5908da18185bfee024482ee855f7f32d7be2dd7 (patch) | |
| tree | ad0568255d4f92672faafa5c4ddbc058fd5c2665 | |
| parent | 0b86874a83da4eab9ddf4b038913f301539be674 (diff) | |
| download | bluez-c5908da18185bfee024482ee855f7f32d7be2dd7.tar.gz | |
Separate between udev rules and configuration files
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | scripts/Makefile.am | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 9cbcfd23..479d3cd9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -256,7 +256,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ bccmd_enable=${enableval} ]) - AC_ARG_ENABLE(pcmcia, AC_HELP_STRING([--enable-pcmcia], [install PCMCIA script and udev rules]), [ + AC_ARG_ENABLE(pcmcia, AC_HELP_STRING([--enable-pcmcia], [install PCMCIA serial script]), [ pcmcia_enable=${enableval} ]) @@ -292,7 +292,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ manpages_enable=${enableval} ]) - AC_ARG_ENABLE(udevrules, AC_HELP_STRING([--enable-udevrules], [install Bluetooth on-demand udev rules]), [ + AC_ARG_ENABLE(udevrules, AC_HELP_STRING([--enable-udevrules], [install Bluetooth udev rules]), [ udevrules_enable=${enableval} ]) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index df950f8e..ce8366a1 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,8 +1,8 @@ -if CONFIGFILES +if UDEVRULES rulesdir = $(sysconfdir)/udev -rules_DATA = +rules_DATA = bluetooth.rules if HID2HCI rules_DATA += bluetooth-hid2hci.rules @@ -11,10 +11,6 @@ endif if PCMCIA rules_DATA += bluetooth-serial.rules endif - -if UDEVRULES -rules_DATA += bluetooth.rules -endif endif if PCMCIA |