[PATCH BlueZ] build: Check for UDEV before setting rulesdir/rules_DATA

[PATCH BlueZ] build: Check for UDEV before setting rulesdir/rules_DATA

[Anderson Lizardo]

Without this check, UDEV_DIR will be empty and an empty "/rules.d"
directory is created on DESTDIR.
---
 Makefile.am |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index a482b54..c10c1fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,6 +174,7 @@ test_scripts =
 include Makefile.tools
 include Makefile.obexd
 
+if UDEV
 rulesdir = @UDEV_DIR@/rules.d
 
 udev_files =
@@ -187,6 +188,7 @@ EXTRA_DIST += tools/hid2hci.rules
 rules_DATA = $(foreach file,$(udev_files), tools/97-$(notdir $(file)))
 
 CLEANFILES += $(rules_DATA)
+endif
 
 if TEST
 testdir = $(pkglibdir)/test
-- 
1.7.9.5

Re: [PATCH BlueZ] build: Check for UDEV before setting rulesdir/rules_DATA

[Marcel Holtmann]

Hi Anderson,

> Without this check, UDEV_DIR will be empty and an empty "/rules.d"
> directory is created on DESTDIR.
> ---
>  Makefile.am |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/Makefile.am b/Makefile.am
> index a482b54..c10c1fa 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -174,6 +174,7 @@ test_scripts =
>  include Makefile.tools
>  include Makefile.obexd
>  
> +if UDEV
>  rulesdir = @UDEV_DIR@/rules.d
>  
>  udev_files =
> @@ -187,6 +188,7 @@ EXTRA_DIST += tools/hid2hci.rules
>  rules_DATA = $(foreach file,$(udev_files), tools/97-$(notdir $(file)))
>  
>  CLEANFILES += $(rules_DATA)
> +endif

great catch, but I fixed this differently by hiding this behind the
HID2HCI condition.

On a side note, you fix has the issue that EXTRA_DIST is now skipped and
that means it would have broken make distcheck by not including the
actual rule file.

Regards

Marcel

Re: [PATCH BlueZ] build: Check for UDEV before setting rulesdir/rules_DATA

[Anderson Lizardo]

Hi Marcel,

On Wed, Dec 19, 2012 at 10:06 AM, Marcel Holtmann <marcel@holtmann.org> wrote:
> On a side note, you fix has the issue that EXTRA_DIST is now skipped and
> that means it would have broken make distcheck by not including the
> actual rule file.

Sorry about that. I actually seen this error (it causes a "cp
tools/hid2hci.rules tools/hid2hci.rules"). But I thought it was due to
another patch that I was going to send, that removed but forgot to
retest.

I'll pay more attention next time ;)

Thanks,
-- 
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil