From: Pawel MOLL <pawel.moll@st.com>
To: alsa-devel@alsa-project.org
Subject: [PATCH] Fix for alsa-lib cross-compilation problems with ALSA_CONFIG_DIR and ALSA_PLUGIN_DIR
Date: Fri, 07 Mar 2008 15:56:21 +0000 [thread overview]
Message-ID: <1204905381.22735.20.camel@bri1004.bri.st.com> (raw)
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>
---
Index: alsa-lib-1.0.16/modules/mixer/simple/Makefile.am
===================================================================
--- alsa-lib-1.0.16.orig/modules/mixer/simple/Makefile.am
+++ alsa-lib-1.0.16/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@
Index: alsa-lib-1.0.16/src/conf/Makefile.am
===================================================================
--- alsa-lib-1.0.16.orig/src/conf/Makefile.am
+++ alsa-lib-1.0.16/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)
Index: alsa-lib-1.0.16/src/conf/cards/Makefile.am
===================================================================
--- alsa-lib-1.0.16.orig/src/conf/cards/Makefile.am
+++ alsa-lib-1.0.16/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
Index: alsa-lib-1.0.16/src/conf/pcm/Makefile.am
===================================================================
--- alsa-lib-1.0.16.orig/src/conf/pcm/Makefile.am
+++ alsa-lib-1.0.16/src/conf/pcm/Makefile.am
@@ -7,5 +7,6 @@ cfg_files = default.conf front.conf rear
EXTRA_DIST = $(cfg_files)
-alsadir = @ALSA_CONFIG_DIR@/pcm
+alsaconfigdir = @ALSA_CONFIG_DIR@
+alsadir = $(alsaconfigdir)/pcm
alsa_DATA = $(cfg_files)
next reply other threads:[~2008-03-07 16:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-07 15:56 Pawel MOLL [this message]
2008-03-07 16:18 ` [PATCH] Fix for alsa-lib cross-compilation problems with ALSA_CONFIG_DIR and ALSA_PLUGIN_DIR Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1204905381.22735.20.camel@bri1004.bri.st.com \
--to=pawel.moll@st.com \
--cc=alsa-devel@alsa-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox