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

"./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>

diff --git a/modules/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am
index 7e49e0746d5fbe68015cbd8c3b6990795065c612..dee1ed9fb3ec61773fd8bfc41f4e127d7ba11865 100644 (file)
--- a/modules/mixer/simple/Makefile.am
+++ b/modules/mixer/simple/Makefile.am
@@ -1,4 +1,5 @@
-pkglibdir = @ALSA_PLUGIN_DIR@/smixer
+alsaplugindir = @ALSA_PLUGIN_DIR@
+pkglibdir = $(alsaplugindir)/smixer
 pythonlibs = @PYTHON_LIBS@
 pythonincludes = @PYTHON_INCLUDES@
 

diff --git a/src/conf/Makefile.am b/src/conf/Makefile.am
index 8698d2919b18ebf7bb9429fd81d8202b676c4e1e..2e5d0bf5a23644e8f91174eba4726f35ebd033da 100644 (file)
--- a/src/conf/Makefile.am
+++ b/src/conf/Makefile.am
@@ -10,5 +10,6 @@ endif
 
 EXTRA_DIST = $(cfg_files)
 
-alsadir = @ALSA_CONFIG_DIR@
+alsaconfigdir = @ALSA_CONFIG_DIR@
+alsadir = $(alsaconfigdir)
 alsa_DATA = $(cfg_files)

diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am
index e73c0039ec7f28374ef4ffae5339553e99e4d1f7..f4d6c17b336802c386106ecf47eb715af56839c5 100644 (file)
--- a/src/conf/cards/Makefile.am
+++ b/src/conf/cards/Makefile.am
@@ -1,4 +1,5 @@
-alsadir = @ALSA_CONFIG_DIR@/cards
+alsaconfigdir = @ALSA_CONFIG_DIR@
+alsadir = $(alsaconfigdir)/cards
 cfg_files = aliases.conf \
        AACI.conf \
        ATIIXP.conf \
@@ -58,7 +59,7 @@ endif
 alsa_DATA = $(cfg_files)
 
 if BUILD_ALISP
-SI7018dir = @ALSA_CONFIG_DIR@/cards/SI7018
+SI7018dir = $(alsaconfigdir)/cards/SI7018
 SI7018_files = \
        SI7018/sndoc-mixer.alisp \
        SI7018/sndop-mixer.alisp

diff --git a/src/conf/pcm/Makefile.am b/src/conf/pcm/Makefile.am
index 48ba45f74572cf9be8c57bb5bc58c1c2c7c90c56..cc3286e6ddf00c59bb087d52b23b331e3af52193 100644 (file)
--- a/src/conf/pcm/Makefile.am
+++ b/src/conf/pcm/Makefile.am
@@ -7,5 +7,6 @@ cfg_files = default.conf front.conf rear.conf center_lfe.conf side.conf\
 
 EXTRA_DIST = $(cfg_files)
 
-alsadir = @ALSA_CONFIG_DIR@/pcm
+alsaconfigdir = @ALSA_CONFIG_DIR@
+alsadir = $(alsaconfigdir)/pcm
 alsa_DATA = $(cfg_files)