From: David Henningsson Date: Fri, 13 Jun 2014 09:31:44 +0000 (+0200) Subject: alsactl: Fixup test for mydatadir/sbindir X-Git-Tag: v1.0.28~2 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=3a7c1c59ecb54bb85bc336f4522e882ada352826;p=alsa-utils.git alsactl: Fixup test for mydatadir/sbindir Use the "mydatadir" name consistently. Signed-off-by: David Henningsson Signed-off-by: Jaroslav Kysela --- diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in index 80fc043..c0c1b23 100644 --- a/alsactl/90-alsa-restore.rules.in +++ b/alsactl/90-alsa-restore.rules.in @@ -1,4 +1,4 @@ -ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", TEST=="@sbindir@", TEST=="@datadir@", GOTO="alsa_restore_go" +ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", TEST=="@sbindir@", TEST=="@mydatadir@", GOTO="alsa_restore_go" GOTO="alsa_restore_end" LABEL="alsa_restore_go" diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index afbedb3..47f06e9 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -44,7 +44,7 @@ endif edit = \ $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ - -e 's,@datadir\@,$(mydatadir),g' \ + -e 's,@mydatadir\@,$(mydatadir),g' \ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ < $< > $@ || rm $@