From efd4ec0b404cb48510126e6a74c8e970083909ce Mon Sep 17 00:00:00 2001 From: Quentin Armitage Date: Thu, 23 May 2024 12:31:01 +0100 Subject: [PATCH] configure: fix secondary config file location when using --prefix=/usr Commit 42a746c - "configure: ${prefix} defaults to NONE which messes up DEFAULT_CONFIG_FILE" broke the checking of whether a secondary default config file location is required. This commit resolves the issue. Signed-off-by: Quentin Armitage --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 98180f9ac3..4e97844b12 100644 --- a/configure.ac +++ b/configure.ac @@ -3154,7 +3154,7 @@ AC_DEFINE_UNQUOTED([DEFAULT_CONFIG_FILE], ["$dcf"], [The default configuration f # Remove a leading ${prefix} since that is not part of the old file name eval dcf_old=`echo $default_config_file` -dcf_old=`echo $dcf_old | $SED -e "s|^\\\${prefix}||"` +dcf_old=`echo $dcf_old | $SED -e "s|^${prefix}||"` AS_IF([test .$dcf != .$dcf_old], [ AC_DEFINE_UNQUOTED([OLD_DEFAULT_CONFIG_FILE], ["$dcf_old"], [The old default configuration file])