Skip to content

Commit

Permalink
configure: fix secondary config file location when using --prefix=/usr
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
pqarmitage committed May 23, 2024
1 parent 4c3ecda commit efd4ec0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down

0 comments on commit efd4ec0

Please sign in to comment.