diff options
author | John Baldwin <jhb@FreeBSD.org> | 2018-12-05 10:51:16 -0800 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2018-12-05 10:51:16 -0800 |
commit | 2861ee4fde97d0afafc506380c5deaf71c8439ac (patch) | |
tree | da7abab189a4ac1cd857e69f1b5405a5ed3eba15 /gdb/configure | |
parent | 3a67e1a6b4430374f3073e51bb19347d4c421cfe (diff) | |
download | gdb-2861ee4fde97d0afafc506380c5deaf71c8439ac.zip gdb-2861ee4fde97d0afafc506380c5deaf71c8439ac.tar.gz gdb-2861ee4fde97d0afafc506380c5deaf71c8439ac.tar.bz2 |
Use separate sed expressions to escape auto-load directories.
Not all sed implementations support alternation via \| in the default
regular expressions. Instead, resort to separate sed expressions via
-e for $debugdir and $datadir. This fixes the default setting of the
auto-load directories on FreeBSD. Previously on FreeBSD the sed
invocation was a no-op causing the debugdir and datadir values to be
expanded yielding an autoload path of ':${prefix}/share/gdb'.
gdb/ChangeLog:
* configure: Re-generate.
* configure.ac: Use separate sed expressions to escape variables
in auto-load directories.
Diffstat (limited to 'gdb/configure')
-rwxr-xr-x | gdb/configure | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/configure b/gdb/configure index 7665ba6..3777230 100755 --- a/gdb/configure +++ b/gdb/configure @@ -6579,7 +6579,7 @@ else with_auto_load_dir='$debugdir:$datadir/auto-load' fi -escape_dir=`echo $with_auto_load_dir | sed 's/[$]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` +escape_dir=`echo $with_auto_load_dir | sed -e 's/[$]datadir\>/\\\\\\\\\\\\&/g' -e 's/[$]debugdir\>/\\\\\\\\\\\\&/g'` test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -6606,7 +6606,7 @@ else with_auto_load_safe_path="$with_auto_load_dir" fi -escape_dir=`echo $with_auto_load_safe_path | sed 's/[$]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` +escape_dir=`echo $with_auto_load_safe_path | sed -e 's/[$]datadir\>/\\\\\\\\\\\\&/g' -e 's/[$]debugdir\>/\\\\\\\\\\\\&/g'` test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' |