asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-22 23:36:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix use of $(SED)

Browse source 
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>
This commit is contained in:
Michał Górny 2011-08-31 22:27:10 +02:00 committed by Clemens Ladisch
parent 0131ab6a67
commit e80b015689
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
alsaconf/Makefile.am
View file

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

2
alsactl/Makefile.am
View file

@ -34,7 +34,7 @@ install-data-hook:
endif endif
edit = \ edit = \
sed $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@
alsa-store.service: alsa-store.service.in alsa-store.service: alsa-store.service.in
$(edit) $(edit)

1
configure.in
View file

@ -28,6 +28,7 @@ dnl AC_PROG_CXX
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_MKDIR_P AC_PROG_MKDIR_P
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_SED
AM_PATH_ALSA(1.0.16) AM_PATH_ALSA(1.0.16)
dnl Check components dnl Check components