asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-09 23:55:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsactl - install initialization files

Browse source 
Also, spearate SOUNDSDIR and DATADIR in configure.in.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2008-08-13 12:26:50 +02:00
parent 21bb9fb975
commit 9957c66e46
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
alsactl/Makefile.am
View file

@ -1,3 +1,5 @@
SUBDIRS = init
sbin_PROGRAMS=alsactl sbin_PROGRAMS=alsactl
man_MANS=alsactl.1 alsactl_init.7 man_MANS=alsactl.1 alsactl_init.7
EXTRA_DIST=alsactl.1 alsactl_init.xml EXTRA_DIST=alsactl.1 alsactl_init.xml

7
alsactl/init/Makefile.am Normal file
View file

@ -0,0 +1,7 @@
init_files = \
00main help info test \
hda
EXTRA_DIRST = $(init_files)
alsainitdir = $(datadir)/alsa/init
alsainit_DATA = $(init_files)

10
configure.in
View file

@ -93,8 +93,11 @@ case "$dir" in
*) dir="$prefix/share" *) dir="$prefix/share"
esac esac
dir="$dir/sounds/alsa" soundsdir="$dir/sounds/alsa"
AC_DEFINE_UNQUOTED(DATADIR, "$dir", [directory containing sample data]) AC_DEFINE_UNQUOTED(SOUNDSDIR, "$soundsdir", [directory containing sample data])
mydatadir="$dir/alsa"
AC_DEFINE_UNQUOTED(DATADIR, "$mydatadir", [directory containing alsa configuration])
AC_ARG_WITH(testsound, AC_ARG_WITH(testsound,
[ --with-testsound=file give the path of test sound file for alsaconf], [ --with-testsound=file give the path of test sound file for alsaconf],
@ -117,7 +120,8 @@ AC_SYS_LARGEFILE
SAVE_UTIL_VERSION SAVE_UTIL_VERSION
AC_OUTPUT(Makefile alsactl/Makefile alsamixer/Makefile amidi/Makefile amixer/Makefile \ AC_OUTPUT(Makefile alsactl/Makefile alsactl/init/Makefile \
alsamixer/Makefile amidi/Makefile amixer/Makefile \
m4/Makefile po/Makefile.in \ m4/Makefile po/Makefile.in \
alsaconf/alsaconf alsaconf/Makefile \ alsaconf/alsaconf alsaconf/Makefile \
alsaconf/po/Makefile \ alsaconf/po/Makefile \

2
speaker-test/speaker-test.c
View file

@ -81,7 +81,7 @@ static pink_noise_t pink;
static snd_pcm_uframes_t buffer_size; static snd_pcm_uframes_t buffer_size;
static snd_pcm_uframes_t period_size; static snd_pcm_uframes_t period_size;
static const char *given_test_wav_file = NULL; static const char *given_test_wav_file = NULL;
static char *wav_file_dir = DATADIR; static char *wav_file_dir = SOUNDSDIR;
static const char *channel_name[MAX_CHANNELS] = { static const char *channel_name[MAX_CHANNELS] = {
N_("Front Left"), N_("Front Left"),