From d587383d6b2dba9731959d5b5ad11e672fb361c7 Mon Sep 17 00:00:00 2001 From: Pawel MOLL Date: Fri, 7 Mar 2008 17:18:16 +0100 Subject: [PATCH] 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 --- modules/mixer/simple/Makefile.am | 3 ++- src/conf/Makefile.am | 3 ++- src/conf/cards/Makefile.am | 5 +++-- src/conf/pcm/Makefile.am | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/mixer/simple/Makefile.am b/modules/mixer/simple/Makefile.am index 7e49e074..dee1ed9f 100644 --- 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 8698d291..2e5d0bf5 100644 --- 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 e73c0039..f4d6c17b 100644 --- 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 48ba45f7..cc3286e6 100644 --- 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) -- 2.47.1