Re: [alsa-devel] [ALSA patch] [PATCH] [-, JACK, plugin, 1/1] configure: use $prefix/etc instead of /etc
On Wed, 20 Mar 2019 18:30:47 +0100, Alex Ivanov wrote:
Use $sysconfdir as prefix for ALSA_LCONF_DIR by default. Otherwise install fails on non-FHS distros.
Signed-off-by: Alex Ivanov gnidorah@ya.ru
configure.ac | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index 5b80585..7b8dd66 100644 --- a/configure.ac +++ b/configure.ac @@ -219,6 +219,23 @@ AC_DEFINE_UNQUOTED(ALSA_DATA_DIR, "$alsadatadir", [directory containing ALSA dat ALSA_DATA_DIR="$alsadatadir" AC_SUBST(ALSA_DATA_DIR)
+dnl ALSA configuration directory +AC_ARG_WITH(alsaconfdir,
- AS_HELP_STRING([--with-alsaconfdir=dir],
- [path where ALSA configuration files are stored]),
- alsaconfdir="$withval", alsaconfdir="")
+if test -z "$alsaconfdir"; then
- eval dir="$sysconfdir"
- case "$dir" in
- /*) ;;
- *) dir="$dir"
- esac
- alsaconfdir="$dir/alsa"
+fi +AC_DEFINE_UNQUOTED(ALSA_CONF_DIR, "$alsaconfdir", [directory containing ALSA configuration files]) +ALSA_CONF_DIR="$alsaconfdir" +AC_SUBST(ALSA_CONF_DIR)
Yet another option is way too confusing, IMO.
dnl ALSA add-on global config directory AC_ARG_WITH(alsagconfdir, AS_HELP_STRING([--with-alsagconfdir=dir], @@ -237,7 +254,7 @@ AC_ARG_WITH(alsalconfdir, [path where ALSA local add-on config files are stored]), alsalconfdir="$withval", alsalconfdir="") if test -z "$alsalconfdir"; then
- alsalconfdir="/etc/alsa/conf.d"
- alsalconfdir="$ALSA_CONF_DIR/conf.d"
Let's add the $sysconfdir usage here instead of adding a new --with-*.
Care to resubmit with that change?
thanks,
Takashi
Hi, Takashi.
Sure. Here we go.
Signed-off-by: Alex Ivanov gnidorah@ya.ru --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index 5b80585..b52923c 100644 --- a/configure.ac +++ b/configure.ac @@ -237,7 +237,7 @@ AC_ARG_WITH(alsalconfdir, [path where ALSA local add-on config files are stored]), alsalconfdir="$withval", alsalconfdir="") if test -z "$alsalconfdir"; then - alsalconfdir="/etc/alsa/conf.d" + alsalconfdir="$sysconfdir/alsa/conf.d" fi AC_DEFINE_UNQUOTED(ALSA_LCONF_DIR, "$alsalconfdir", [directory containing local ALSA add-on config files]) ALSA_LCONF_DIR="$alsalconfdir"
On Fri, 22 Mar 2019 16:44:10 +0100, Alex Ivanov wrote:
Hi, Takashi.
Sure. Here we go.
Signed-off-by: Alex Ivanov gnidorah@ya.ru
Erm, please keep more context in the patch description.
configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index 5b80585..b52923c 100644 --- a/configure.ac +++ b/configure.ac @@ -237,7 +237,7 @@ AC_ARG_WITH(alsalconfdir, [path where ALSA local add-on config files are stored]), alsalconfdir="$withval", alsalconfdir="") if test -z "$alsalconfdir"; then
- alsalconfdir="/etc/alsa/conf.d"
- alsalconfdir="$sysconfdir/alsa/conf.d"
fi
I tested this change, and it resulted in a bad string #define ALSA_LCONF_DIR "${prefix}/etc/alsa/conf.d"
Actually the same bug is found in other places, e.g. #define ALSA_DATA_DIR "${prefix}/share/alsa"
Hmm.
Takashi
Use $sysconfdir as prefix for ALSA_LCONF_DIR by default. Otherwise install fails on non-FHS distros.
Signed-off-by: Alex Ivanov gnidorah@ya.ru --- configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index 5b80585..1be4a70 100644 --- a/configure.ac +++ b/configure.ac @@ -237,7 +237,12 @@ AC_ARG_WITH(alsalconfdir, [path where ALSA local add-on config files are stored]), alsalconfdir="$withval", alsalconfdir="") if test -z "$alsalconfdir"; then - alsalconfdir="/etc/alsa/conf.d" + eval dir="$sysconfdir" + case "$dir" in + /*) ;; + *) dir="$dir" + esac + alsalconfdir="$dir/alsa/conf.d" fi AC_DEFINE_UNQUOTED(ALSA_LCONF_DIR, "$alsalconfdir", [directory containing local ALSA add-on config files]) ALSA_LCONF_DIR="$alsalconfdir"
participants (2)
-
Alex Ivanov
-
Takashi Iwai