forked from pool/alsa-utils
Takashi Iwai
9360abd88a
- Increase the max channels of aplay to 256. - Fix sed usage in Makefile.am OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=39
92 lines
2.8 KiB
Diff
92 lines
2.8 KiB
Diff
From e80b015689ce7a632c8cf57a29bd703eef4edbbc Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
Date: Wed, 31 Aug 2011 22:27:10 +0200
|
|
Subject: [PATCH] fix use of $(SED)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
---
|
|
alsaconf/Makefile.am | 16 ++++++++--------
|
|
alsactl/Makefile.am | 2 +-
|
|
configure.in | 1 +
|
|
3 files changed, 10 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/alsaconf/Makefile.am b/alsaconf/Makefile.am
|
|
index a11ecc5..a4f5e4a 100644
|
|
--- 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 5cfc415..c434e44 100644
|
|
--- 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 9ec1fac..b28af80 100644
|
|
--- 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
|
|
--
|
|
1.7.6.1
|
|
|