alsactl: Fixup test for mydatadir/sbindir

Use the "mydatadir" name consistently.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in
index 80fc04301dac5c516a5fbf12a2959bd7405b9e77..c0c1b232bb380eff89fbacf9e0f022e7fbddd190 100644 (file)
--- 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 afbedb363903f97b6ae72cd2a6f4722e682f4335..47f06e906ced88d1460614722353bdf8806d4f70 100644 (file)
--- 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 $@