mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for alsa-lib cross-compilation problems with ALSA_CONFIG_DIR and ALSA_PLUGIN_DIR

Browse source 
"./configure" options for selecting ALSA configuration (default
/usr/share/alsa) and plugin (/usr/lib/alsa-lib) directories introduced
by alsa-hg/alsa-lib changeset 2284 cause problems with cross-compilation
and packaging - there is no way to redefine them in runtime, during
installation phase.

This patch adds a level of indirection between constants and their
usage - alsaconfigdir for ALSA_CONFIG_DIR and alsaplugindir for
ALSA_PLUGIN_DIR - which can be redefined during "make install" stage.

Signed-off-by: Pawel MOLL <pawel.moll@st.com>
This commit is contained in:
Pawel MOLL 2008-03-07 17:18:16 +01:00 • committed by Takashi Iwai
parent df87a4be3d
commit d587383d6b
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/mixer/simple/Makefile.am
View file

@ -1,4 +1,5 @@
pkglibdir = @ALSA_PLUGIN_DIR@/smixer alsaplugindir = @ALSA_PLUGIN_DIR@
pkglibdir = $(alsaplugindir)/smixer
pythonlibs = @PYTHON_LIBS@ pythonlibs = @PYTHON_LIBS@
pythonincludes = @PYTHON_INCLUDES@ pythonincludes = @PYTHON_INCLUDES@

3
src/conf/Makefile.am
View file

@ -10,5 +10,6 @@ endif
EXTRA_DIST = $(cfg_files) EXTRA_DIST = $(cfg_files)
alsadir = @ALSA_CONFIG_DIR@ alsaconfigdir = @ALSA_CONFIG_DIR@
alsadir = $(alsaconfigdir)
alsa_DATA = $(cfg_files) alsa_DATA = $(cfg_files)

5
src/conf/cards/Makefile.am
View file

@ -1,4 +1,5 @@
alsadir = @ALSA_CONFIG_DIR@/cards alsaconfigdir = @ALSA_CONFIG_DIR@
alsadir = $(alsaconfigdir)/cards
cfg_files = aliases.conf \ cfg_files = aliases.conf \
AACI.conf \ AACI.conf \
ATIIXP.conf \ ATIIXP.conf \
@ -58,7 +59,7 @@ endif
alsa_DATA = $(cfg_files) alsa_DATA = $(cfg_files)
if BUILD_ALISP if BUILD_ALISP
SI7018dir = @ALSA_CONFIG_DIR@/cards/SI7018 SI7018dir = $(alsaconfigdir)/cards/SI7018
SI7018_files = \ SI7018_files = \
SI7018/sndoc-mixer.alisp \ SI7018/sndoc-mixer.alisp \
SI7018/sndop-mixer.alisp SI7018/sndop-mixer.alisp

3
src/conf/pcm/Makefile.am
View file

@ -7,5 +7,6 @@ cfg_files = default.conf front.conf rear.conf center_lfe.conf side.conf\
EXTRA_DIST = $(cfg_files) EXTRA_DIST = $(cfg_files)
alsadir = @ALSA_CONFIG_DIR@/pcm alsaconfigdir = @ALSA_CONFIG_DIR@
alsadir = $(alsaconfigdir)/pcm
alsa_DATA = $(cfg_files) alsa_DATA = $(cfg_files)