fix use of $(SED)

The alsactl Makefile used 'sed $(SED)' which is going to failed when SED
is actually set. Replaced that with '$(SED)', and a few 'sed' calls in
alsaconf Makefile as well. Added AC_PROG_SED to configure to have it
set.

Fixes: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5363
Fixes: http://bugs.gentoo.org/show_bug.cgi?id=366587
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>

diff --git a/alsaconf/Makefile.am b/alsaconf/Makefile.am
index a11ecc57f9c4df15517b897905ee4c798a08a62f..a4f5e4a8273d7ee5be3bfa28486243d704d0e103 100644 (file)
--- a/alsaconf/Makefile.am
+++ b/alsaconf/Makefile.am
@@ -5,13 +5,13 @@ SUBDIRS = po
 
 install-man8:
        @for i in $(man_MANS); do \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         inst=`echo $$i | sed -e 's/\\.[^.]*$$//'`; \
+         ext=`echo $$i | $(SED) -e 's/^.*\\.//'`; \
+         inst=`echo $$i | $(SED) -e 's/\\.[^.]*$$//'`; \
          case $$inst in \
          *.[a-za-z]*)\
-           loc=`echo $$inst | sed -e 's/^.*\\.//'`; \
+           loc=`echo $$inst | $(SED) -e 's/^.*\\.//'`; \
            loc="/$$loc"; \
-           inst=`echo $$inst | sed -e 's/\\.[^.]*$$//'`;; \
+           inst=`echo $$inst | $(SED) -e 's/\\.[^.]*$$//'`;; \
          *)\
            loc="";; \
          esac; \
@@ -22,13 +22,13 @@ install-man8:
 
 uninstall-man8:
        @for i in $(man_MANS); do \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         inst=`echo $$i | sed -e 's/\\.[^.]*$$//'`; \
+         ext=`echo $$i | $(SED) -e 's/^.*\\.//'`; \
+         inst=`echo $$i | $(SED) -e 's/\\.[^.]*$$//'`; \
          case $$inst in \
          *.[a-za-z]*)\
-           loc=`echo $$inst | sed -e 's/^.*\\.//'`; \
+           loc=`echo $$inst | $(SED) -e 's/^.*\\.//'`; \
            loc="/$$loc"; \
-           inst=`echo $$inst | sed -e 's/\\.[^.]*$$//'`;; \
+           inst=`echo $$inst | $(SED) -e 's/\\.[^.]*$$//'`;; \
          *)\
            loc="";; \
          esac; \

diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
index 5cfc415be44b2f0c9e759a9689344447a79c2deb..c434e449858c611b8e0e49a37e8cb26721e3b5ac 100644 (file)
--- a/alsactl/Makefile.am
+++ b/alsactl/Makefile.am
@@ -34,7 +34,7 @@ install-data-hook:
 endif
 
 edit = \
-       sed $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
+       $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
 
 alsa-store.service: alsa-store.service.in
        $(edit)

diff --git a/configure.in b/configure.in
index 9ec1face9368de1909d87ad8e8adab327477a512..b28af8041312b3eee6e09b7b39e93ff30c8c2977 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,7 @@ dnl AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_MKDIR_P
 AC_PROG_LN_S
+AC_PROG_SED
 AM_PATH_ALSA(1.0.16)
 
 dnl Check components