build: give AudioReach its own /etc and /usr/share namespace

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

linux/reference/Makefile.am

@@ -7,12 +7,12 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)
 
 if HAVE_LIBALSA

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])
+])

nxp/reference/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/GLYMUR/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/Kaanapali/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/MAHUA/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/X1E80100/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

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

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])
+])

qcom/qli/qcm6490/Makefile.am

@@ -7,13 +7,13 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/qcs615/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/qcs8275/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/qcs8300/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/qcs9075/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/qcs9100/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/shikra_cqs/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/shikra_iqs/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)

qcom/qli/sm8750/Makefile.am

@@ -7,10 +7,10 @@ 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
 
-config_carddefdir = $(sysconfdir)
+config_carddefdir = $(audioreachconfdir)
 config_carddef_DATA = $(config_carddef)