Re: [PATCHES] Integrate minimal systemd support in alsa-utils

[Colin Guthrie <gmane@colin.guthr.ie>]

[-- Attachment #1: Type: text/plain, Size: 1358 bytes --]

'Twas brillig, and Lennart Poettering at 24/11/10 19:47 did gyre and gimble:
> On Wed, 24.11.10 17:55, Colin Guthrie (gmane@colin.guthr.ie) wrote:
> 
>>
>> 'Twas brillig, and Lennart Poettering at 23/11/10 02:16 did gyre and gimble:
>>> +udevrulesdir=/lib/udev/rules.d
>>> +
>>
>> This doesn't appear to be used unless I missed something?
>>
>> If it were used, I'd rather make this configurable. Obviously udev
>> pretty much mandates this path but it's a PITA when doing non-root make
>> installs to custom prefixes when it's hard coded like this. But like I
>> say, this looks unused here...
> 
> Well, it still honours $(DESTDIR) logic.

Yeah but it's still a PITA for self-builds and (I'm told from Arun) some
Gentoo stuff too.

Anyway, I've attached an entirely uncontroversial patch that fixes up
any issues for those that care. Same as an earlier commit from last year
in PulseAudio by Arun Raghavan.


> It's referenced by the dist_udevrules_DATA= stanza.

Ahh OK, I don't really grok auto* foo, but I can spot some pixie dust
there that kinda makes sense :)

Cheers

Col

-- 

Colin Guthrie
gmane(at)colin.guthr.ie
http://colin.guthr.ie/

Day Job:
  Tribalogic Limited [http://www.tribalogic.net/]
Open Source:
  Mageia Contributor [http://www.mageia.org/]
  PulseAudio Hacker [http://www.pulseaudio.org/]
  Trac Hacker [http://trac.edgewall.org/]

[-- Attachment #2: 0001-alsactl-Add-a-with-udev-rules-dir-configure-option.patch --]
[-- Type: text/x-patch, Size: 1752 bytes --]

>From aee9d692defc05f2599363f0456cc837c3ef9a05 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <cguthrie@mandriva.org>
Date: Thu, 25 Nov 2010 21:40:25 +0000
Subject: [PATCH] alsactl: Add a --with-udev-rules-dir configure option.

After the previous patch to install udev rules it is impossible to do a
non-root, custom-prefix make install. This is generally not a problem
when building official packages but it can be a pain for developers
and debuggers etc.

This is essentially the same patch as was already made in PulseAudio
in commit e8a5746f2fcae59bfd18d39b621509b3ef130453.
---
 alsactl/Makefile.am |    2 --
 configure.in        |    6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
index 721b619..5cfc415 100644
--- a/alsactl/Makefile.am
+++ b/alsactl/Makefile.am
@@ -11,8 +11,6 @@ alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c
 alsactl_CFLAGS=$(AM_CFLAGS) -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\"
 noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
 
-udevrulesdir=/lib/udev/rules.d
-
 dist_udevrules_DATA = \
 	90-alsa-restore.rules
 
diff --git a/configure.in b/configure.in
index 94a2b17..5b3491d 100644
--- a/configure.in
+++ b/configure.in
@@ -112,6 +112,12 @@ if test x"$alsaconf" = xtrue; then
 fi
 AM_CONDITIONAL(USE_XMLTO, test x"$xmlto" = xyes)
 
+AC_ARG_WITH(
+        [udev-rules-dir],
+        AS_HELP_STRING([--with-udev-rules-dir],[Directory where to install udev rules to (defaults to /lib/udev/rules.d)]),
+        [udevrulesdir=$withval], [udevrulesdir="/lib/udev/rules.d"])
+AC_SUBST(udevrulesdir)
+
 dnl Checks for header files.
 AC_HEADER_STDC
 if test x$alsamixer = xtrue; then
-- 
1.7.3.2


[-- Attachment #3: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel