Merge pull request #2417 from pqarmitage/updates

pqarmitage · web-flow · commit 18f75a6f0911 · 2024-05-23T12:35:49.000+01:00
configure: fix secondary config file location when using --prefix=/usr
diff --git 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])

Original file line number	Diff line number	Diff line change
`@@ -3154,7 +3154,7 @@ AC_DEFINE_UNQUOTED([DEFAULT_CONFIG_FILE], ["$dcf"], [The default configuration f`
`3154`	`3154`
`3155`	`3155`	`# Remove a leading ${prefix} since that is not part of the old file name`
`3156`	`3156`	eval dcf_old=`echo $default_config_file`
`3157`		-dcf_old=`echo $dcf_old \| $SED -e "s\|^\\\${prefix}\|\|"`
	`3157`	+dcf_old=`echo $dcf_old \| $SED -e "s\|^${prefix}\|\|"`
`3158`	`3158`	`AS_IF([test .$dcf != .$dcf_old],`
`3159`	`3159`	`[`
`3160`	`3160`	`AC_DEFINE_UNQUOTED([OLD_DEFAULT_CONFIG_FILE], ["$dcf_old"], [The old default configuration file])`