From f2de5447e851eb861a09b3507ba74e1fedf1060f Mon Sep 17 00:00:00 2001 From: Ali Erdinc Koroglu Date: Thu, 3 Sep 2026 15:51:59 +0300 Subject: [PATCH 1/3] build: add AR_PATHS macro for shared installation paths Introduce m4/audioreach-paths.m4, defining three directories as both configure options and make variables: audioreachconfdir ${sysconfdir}/audioreach audioreachdatadir ${datadir}/audioreach audioreachdeltadir ${localstatedir}/lib/audioreach/acdb-delta Nothing uses them yet; the following commits route the install directories through them. The audio stack currently installs unqualified names into the root of /etc: card-defs.xml here, and plugin_manager.xml and usecaseKvManager.xml from audioreach-pal. Nothing about "plugin_manager.xml" is audio-specific, and /etc is a namespace shared with every other package on the system. /etc/card-defs.xml also does not say what it configures, whereas ls /etc/audioreach/ is a complete inventory of what is tunable in the audio stack. The paths are also hardcoded today, so this package cannot be built correctly for any prefix but the default: --sysconfdir has no effect. Distributions that want the historical locations can pass --with-audioreach-confdir and --with-audioreach-datadir. The same macro is used by audioreach-graphmgr and audioreach-pal, which declare the locations of files this package installs. It is copied into each project rather than shared through a package: it has no dependencies, and centralising it would give three repos a build-time dependency on a fourth. This repo holds the canonical copy; bump the serial when it changes. Copies live in m4/ and qcom/qli/m4/ because qcom/qli is an independent AC_INIT sub-package that can be configured standalone. Signed-off-by: Ali Erdinc Koroglu --- configure.ac | 2 ++ m4/audioreach-paths.m4 | 46 +++++++++++++++++++++++++++++++++ qcom/qli/configure.ac | 2 ++ qcom/qli/m4/audioreach-paths.m4 | 46 +++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 m4/audioreach-paths.m4 create mode 100644 qcom/qli/m4/audioreach-paths.m4 diff --git a/configure.ac b/configure.ac index 6af70b4..7919729 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ AC_INIT([audioreach-conf],1.0.0) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) # defines some macros variable to be included by source AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIRS([m4]) +AR_PATHS # Checks for programs. AC_PROG_CC diff --git a/m4/audioreach-paths.m4 b/m4/audioreach-paths.m4 new file mode 100644 index 0000000..eda3cbc --- /dev/null +++ b/m4/audioreach-paths.m4 @@ -0,0 +1,46 @@ +# audioreach-paths.m4 -- shared installation paths for AudioReach +# serial 1 +# +# SPDX-License-Identifier: BSD-3-Clause +# +# Usage, in configure.ac: +# +# AC_CONFIG_MACRO_DIRS([m4]) +# AR_PATHS +# +# Provides three directories, as configure options and as make variables: +# +# audioreachconfdir integrator-editable configuration +# audioreachdatadir read-only vendor data +# audioreachdeltadir runtime-writable ACDB deltas +# +# Do not AC_DEFINE these. ${sysconfdir} is unexpanded at configure time, so +# AC_DEFINE would put a literal "${prefix}" into config.h. Pass them to the +# compiler from Makefile.am instead, where make expands them: +# +# AM_CFLAGS += -DCARD_DEF_FILE=\"$(audioreachconfdir)/card-defs.xml\" + +AC_DEFUN([AR_PATHS], [ + + AC_ARG_WITH([audioreach-confdir], + [AS_HELP_STRING([--with-audioreach-confdir=DIR], + [AudioReach configuration directory @<:@SYSCONFDIR/audioreach@:>@])], + [audioreachconfdir="$withval"], + [audioreachconfdir='${sysconfdir}/audioreach']) + + AC_ARG_WITH([audioreach-datadir], + [AS_HELP_STRING([--with-audioreach-datadir=DIR], + [AudioReach read-only data directory @<:@DATADIR/audioreach@:>@])], + [audioreachdatadir="$withval"], + [audioreachdatadir='${datadir}/audioreach']) + + AC_ARG_WITH([audioreach-deltadir], + [AS_HELP_STRING([--with-audioreach-deltadir=DIR], + [AudioReach ACDB delta directory @<:@LOCALSTATEDIR/lib/audioreach/acdb-delta@:>@])], + [audioreachdeltadir="$withval"], + [audioreachdeltadir='${localstatedir}/lib/audioreach/acdb-delta']) + + AC_SUBST([audioreachconfdir]) + AC_SUBST([audioreachdatadir]) + AC_SUBST([audioreachdeltadir]) +]) diff --git a/qcom/qli/configure.ac b/qcom/qli/configure.ac index 70a709d..cb9b771 100644 --- a/qcom/qli/configure.ac +++ b/qcom/qli/configure.ac @@ -11,6 +11,8 @@ AC_INIT([audioreach-conf],1.0.0) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) # defines some macros variable to be included by source AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIRS([m4]) +AR_PATHS # Checks for programs. AC_PROG_CC diff --git a/qcom/qli/m4/audioreach-paths.m4 b/qcom/qli/m4/audioreach-paths.m4 new file mode 100644 index 0000000..eda3cbc --- /dev/null +++ b/qcom/qli/m4/audioreach-paths.m4 @@ -0,0 +1,46 @@ +# audioreach-paths.m4 -- shared installation paths for AudioReach +# serial 1 +# +# SPDX-License-Identifier: BSD-3-Clause +# +# Usage, in configure.ac: +# +# AC_CONFIG_MACRO_DIRS([m4]) +# AR_PATHS +# +# Provides three directories, as configure options and as make variables: +# +# audioreachconfdir integrator-editable configuration +# audioreachdatadir read-only vendor data +# audioreachdeltadir runtime-writable ACDB deltas +# +# Do not AC_DEFINE these. ${sysconfdir} is unexpanded at configure time, so +# AC_DEFINE would put a literal "${prefix}" into config.h. Pass them to the +# compiler from Makefile.am instead, where make expands them: +# +# AM_CFLAGS += -DCARD_DEF_FILE=\"$(audioreachconfdir)/card-defs.xml\" + +AC_DEFUN([AR_PATHS], [ + + AC_ARG_WITH([audioreach-confdir], + [AS_HELP_STRING([--with-audioreach-confdir=DIR], + [AudioReach configuration directory @<:@SYSCONFDIR/audioreach@:>@])], + [audioreachconfdir="$withval"], + [audioreachconfdir='${sysconfdir}/audioreach']) + + AC_ARG_WITH([audioreach-datadir], + [AS_HELP_STRING([--with-audioreach-datadir=DIR], + [AudioReach read-only data directory @<:@DATADIR/audioreach@:>@])], + [audioreachdatadir="$withval"], + [audioreachdatadir='${datadir}/audioreach']) + + AC_ARG_WITH([audioreach-deltadir], + [AS_HELP_STRING([--with-audioreach-deltadir=DIR], + [AudioReach ACDB delta directory @<:@LOCALSTATEDIR/lib/audioreach/acdb-delta@:>@])], + [audioreachdeltadir="$withval"], + [audioreachdeltadir='${localstatedir}/lib/audioreach/acdb-delta']) + + AC_SUBST([audioreachconfdir]) + AC_SUBST([audioreachdatadir]) + AC_SUBST([audioreachdeltadir]) +]) From 7e5f3e62614a3335aca562858222aed9e05b7509 Mon Sep 17 00:00:00 2001 From: Ali Erdinc Koroglu Date: Thu, 3 Sep 2026 15:53:58 +0300 Subject: [PATCH 2/3] build: install ACDB data under $(audioreachdatadir) acdb_cal.acdb and workspaceFileXml.qwsp are read-only vendor data, not configuration: they are produced offline by QACT and are not edited on the device. They belong under ${datadir}, not ${sysconfdir}. /etc/acdbdata// -> /usr/share/audioreach/acdbdata// qcm6490 has two of these directories -- QCS6490_RB3Gen2 and QCM6490_IDP -- and both are converted. audioreach-graphmgr reads this location as -DACDB_PATH and must be updated to match. Packaging that lists ${sysconfdir}/acdbdata needs updating too. Note that ACDB tuning deltas are written at runtime by ATS, so they cannot live under a read-only /usr; audioreachdeltadir is separate for that reason and is used by audioreach-graphmgr, not here. Signed-off-by: Ali Erdinc Koroglu --- linux/reference/Makefile.am | 2 +- nxp/reference/Makefile.am | 2 +- qcom/qli/GLYMUR/Makefile.am | 2 +- qcom/qli/Kaanapali/Makefile.am | 2 +- qcom/qli/MAHUA/Makefile.am | 2 +- qcom/qli/X1E80100/Makefile.am | 2 +- qcom/qli/qcm6490/Makefile.am | 4 ++-- qcom/qli/qcs615/Makefile.am | 2 +- qcom/qli/qcs8275/Makefile.am | 2 +- qcom/qli/qcs8300/Makefile.am | 2 +- qcom/qli/qcs9075/Makefile.am | 2 +- qcom/qli/qcs9100/Makefile.am | 2 +- qcom/qli/shikra_cqs/Makefile.am | 2 +- qcom/qli/shikra_iqs/Makefile.am | 2 +- qcom/qli/sm8750/Makefile.am | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/linux/reference/Makefile.am b/linux/reference/Makefile.am index 25e514c..f670368 100644 --- a/linux/reference/Makefile.am +++ b/linux/reference/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/nxp/reference/Makefile.am b/nxp/reference/Makefile.am index 827eb97..00e03c9 100644 --- a/nxp/reference/Makefile.am +++ b/nxp/reference/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/GLYMUR/Makefile.am b/qcom/qli/GLYMUR/Makefile.am index 57f70cd..f10440b 100644 --- a/qcom/qli/GLYMUR/Makefile.am +++ b/qcom/qli/GLYMUR/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/GLYMUR/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/GLYMUR/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/Kaanapali/Makefile.am b/qcom/qli/Kaanapali/Makefile.am index e58f452..07f0ddc 100644 --- a/qcom/qli/Kaanapali/Makefile.am +++ b/qcom/qli/Kaanapali/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/Kaanapali/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/Kaanapali/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/MAHUA/Makefile.am b/qcom/qli/MAHUA/Makefile.am index 596127f..e433ac5 100644 --- a/qcom/qli/MAHUA/Makefile.am +++ b/qcom/qli/MAHUA/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/MAHUA/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/MAHUA/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/X1E80100/Makefile.am b/qcom/qli/X1E80100/Makefile.am index 79fe460..168cd3d 100644 --- a/qcom/qli/X1E80100/Makefile.am +++ b/qcom/qli/X1E80100/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/X1E80100/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/X1E80100/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/qcm6490/Makefile.am b/qcom/qli/qcm6490/Makefile.am index e0ebc31..7e50b4e 100644 --- a/qcom/qli/qcm6490/Makefile.am +++ b/qcom/qli/qcm6490/Makefile.am @@ -7,10 +7,10 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/QCS6490_RB3Gen2/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/QCS6490_RB3Gen2/ config_acdbdata_DATA = $(config_acdbdata) -config_acdbdata_idpdir = $(sysconfdir)/acdbdata/QCM6490_IDP/ +config_acdbdata_idpdir = $(audioreachdatadir)/acdbdata/QCM6490_IDP/ config_acdbdata_idp_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/qcs615/Makefile.am b/qcom/qli/qcs615/Makefile.am index 4d73ad6..de88a68 100644 --- a/qcom/qli/qcs615/Makefile.am +++ b/qcom/qli/qcs615/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/TALOS_EVK/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/TALOS_EVK/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/qcs8275/Makefile.am b/qcom/qli/qcs8275/Makefile.am index 87e7f22..98675c9 100644 --- a/qcom/qli/qcs8275/Makefile.am +++ b/qcom/qli/qcs8275/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/MONACO_EVK/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/MONACO_EVK/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/qcs8300/Makefile.am b/qcom/qli/qcs8300/Makefile.am index 70db981..d1678c5 100644 --- a/qcom/qli/qcs8300/Makefile.am +++ b/qcom/qli/qcs8300/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/qcs8300/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/qcs8300/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/qcs9075/Makefile.am b/qcom/qli/qcs9075/Makefile.am index 735ee05..6fd1ee4 100644 --- a/qcom/qli/qcs9075/Makefile.am +++ b/qcom/qli/qcs9075/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/LEMANS_EVK/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/LEMANS_EVK/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/qcs9100/Makefile.am b/qcom/qli/qcs9100/Makefile.am index fa35744..a8126c5 100644 --- a/qcom/qli/qcs9100/Makefile.am +++ b/qcom/qli/qcs9100/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/qcs9100/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/qcs9100/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/shikra_cqs/Makefile.am b/qcom/qli/shikra_cqs/Makefile.am index c3513d1..da3b568 100644 --- a/qcom/qli/shikra_cqs/Makefile.am +++ b/qcom/qli/shikra_cqs/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/shikra_cqs_evk/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/shikra_cqs_evk/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/shikra_iqs/Makefile.am b/qcom/qli/shikra_iqs/Makefile.am index 0bf013c..5113c25 100644 --- a/qcom/qli/shikra_iqs/Makefile.am +++ b/qcom/qli/shikra_iqs/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/shikra_iqs_evk/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/shikra_iqs_evk/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml diff --git a/qcom/qli/sm8750/Makefile.am b/qcom/qli/sm8750/Makefile.am index e7e4542..f158483 100644 --- a/qcom/qli/sm8750/Makefile.am +++ b/qcom/qli/sm8750/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -Wall -Werror config_acdbdata = acdbdata/acdb_cal.acdb\ acdbdata/workspaceFileXml.qwsp -config_acdbdatadir = $(sysconfdir)/acdbdata/SM8750_MTP/ +config_acdbdatadir = $(audioreachdatadir)/acdbdata/SM8750_MTP/ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml From 195b80c72af6c13689c2c05e9a37a3b5de0913a4 Mon Sep 17 00:00:00 2001 From: Ali Erdinc Koroglu Date: Thu, 3 Sep 2026 15:55:40 +0300 Subject: [PATCH 3/3] build: install card-defs.xml under $(audioreachconfdir) card-defs.xml is integrator-editable configuration, unlike the ACDB blobs installed alongside it, so it uses the configuration directory rather than the data directory. /etc/card-defs.xml -> /etc/audioreach/card-defs.xml This file's location is also declared in audioreach-graphmgr (CARD_DEF_FILE) and audioreach-pal (SNDPARSER), both of which read it. pal cannot delegate the lookup: snd_card_def_get_card() takes a card number and no path. All three must move together, or audio comes up with no card definition and no obvious cause. A compatibility symlink at /etc/card-defs.xml is advisable for one release. $(sysconfdir)/alsa/conf.d in linux/reference is deliberately untouched; that namespace belongs to ALSA. Signed-off-by: Ali Erdinc Koroglu --- linux/reference/Makefile.am | 2 +- nxp/reference/Makefile.am | 2 +- qcom/qli/GLYMUR/Makefile.am | 2 +- qcom/qli/Kaanapali/Makefile.am | 2 +- qcom/qli/MAHUA/Makefile.am | 2 +- qcom/qli/X1E80100/Makefile.am | 2 +- qcom/qli/qcm6490/Makefile.am | 2 +- qcom/qli/qcs615/Makefile.am | 2 +- qcom/qli/qcs8275/Makefile.am | 2 +- qcom/qli/qcs8300/Makefile.am | 2 +- qcom/qli/qcs9075/Makefile.am | 2 +- qcom/qli/qcs9100/Makefile.am | 2 +- qcom/qli/shikra_cqs/Makefile.am | 2 +- qcom/qli/shikra_iqs/Makefile.am | 2 +- qcom/qli/sm8750/Makefile.am | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/linux/reference/Makefile.am b/linux/reference/Makefile.am index f670368..763a04c 100644 --- a/linux/reference/Makefile.am +++ b/linux/reference/Makefile.am @@ -12,7 +12,7 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) if HAVE_LIBALSA diff --git a/nxp/reference/Makefile.am b/nxp/reference/Makefile.am index 00e03c9..81a4716 100644 --- a/nxp/reference/Makefile.am +++ b/nxp/reference/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/GLYMUR/Makefile.am b/qcom/qli/GLYMUR/Makefile.am index f10440b..f59d06f 100644 --- a/qcom/qli/GLYMUR/Makefile.am +++ b/qcom/qli/GLYMUR/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/Kaanapali/Makefile.am b/qcom/qli/Kaanapali/Makefile.am index 07f0ddc..00c8e7d 100644 --- a/qcom/qli/Kaanapali/Makefile.am +++ b/qcom/qli/Kaanapali/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/MAHUA/Makefile.am b/qcom/qli/MAHUA/Makefile.am index e433ac5..e5586b8 100644 --- a/qcom/qli/MAHUA/Makefile.am +++ b/qcom/qli/MAHUA/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/X1E80100/Makefile.am b/qcom/qli/X1E80100/Makefile.am index 168cd3d..42ae9c4 100644 --- a/qcom/qli/X1E80100/Makefile.am +++ b/qcom/qli/X1E80100/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcm6490/Makefile.am b/qcom/qli/qcm6490/Makefile.am index 7e50b4e..6433f99 100644 --- a/qcom/qli/qcm6490/Makefile.am +++ b/qcom/qli/qcm6490/Makefile.am @@ -15,5 +15,5 @@ config_acdbdata_idp_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs615/Makefile.am b/qcom/qli/qcs615/Makefile.am index de88a68..60db21d 100644 --- a/qcom/qli/qcs615/Makefile.am +++ b/qcom/qli/qcs615/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs8275/Makefile.am b/qcom/qli/qcs8275/Makefile.am index 98675c9..d4e13ca 100644 --- a/qcom/qli/qcs8275/Makefile.am +++ b/qcom/qli/qcs8275/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs8300/Makefile.am b/qcom/qli/qcs8300/Makefile.am index d1678c5..d81b0ae 100644 --- a/qcom/qli/qcs8300/Makefile.am +++ b/qcom/qli/qcs8300/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs9075/Makefile.am b/qcom/qli/qcs9075/Makefile.am index 6fd1ee4..93931dd 100644 --- a/qcom/qli/qcs9075/Makefile.am +++ b/qcom/qli/qcs9075/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/qcs9100/Makefile.am b/qcom/qli/qcs9100/Makefile.am index a8126c5..68076fd 100644 --- a/qcom/qli/qcs9100/Makefile.am +++ b/qcom/qli/qcs9100/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/shikra_cqs/Makefile.am b/qcom/qli/shikra_cqs/Makefile.am index da3b568..dcea694 100644 --- a/qcom/qli/shikra_cqs/Makefile.am +++ b/qcom/qli/shikra_cqs/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/shikra_iqs/Makefile.am b/qcom/qli/shikra_iqs/Makefile.am index 5113c25..ccadde9 100644 --- a/qcom/qli/shikra_iqs/Makefile.am +++ b/qcom/qli/shikra_iqs/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef) diff --git a/qcom/qli/sm8750/Makefile.am b/qcom/qli/sm8750/Makefile.am index f158483..eeff8b1 100644 --- a/qcom/qli/sm8750/Makefile.am +++ b/qcom/qli/sm8750/Makefile.am @@ -12,5 +12,5 @@ config_acdbdata_DATA = $(config_acdbdata) config_carddef = card-defs.xml -config_carddefdir = $(sysconfdir) +config_carddefdir = $(audioreachconfdir) config_carddef_DATA = $(config_carddef)