From 07abfebf80b9f27762cf84c1da6e01e246dd1d2c Mon Sep 17 00:00:00 2001
From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Wed, 16 May 2007 07:24:08 +0000
Subject: gdb/ 	* configure.ac: Allow sysroots to be relocated under $prefix
 as 	well as $exec_prefix. 	* configure: Regenerate.

---
 gdb/configure.ac | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'gdb/configure.ac')

diff --git a/gdb/configure.ac b/gdb/configure.ac
index 6db1a18..3a579fd 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1121,17 +1121,20 @@ AC_ARG_WITH(sysroot,
 
  TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
 
+ if test "x$prefix" = xNONE; then
+  test_prefix=/usr/local
+ else
+  test_prefix=$prefix
+ fi
  if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then
-  if test "x$prefix" = xNONE; then
-   test_prefix=/usr/local
-  else
-   test_prefix=$prefix
-  fi
+  test_exec_prefix=$test_prefix
  else
-  test_prefix=$exec_prefix
+  test_exec_prefix=$exec_prefix
  fi
  case ${TARGET_SYSTEM_ROOT} in
  "${test_prefix}"|"${test_prefix}/"*|\
+ "${test_exec_prefix}"|"${test_exec_prefix}/"*|\
+ '${prefix}'|'${prefix}/'*|\
  '${exec_prefix}'|'${exec_prefix}/'*)
    t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE"
    TARGET_SYSTEM_ROOT_DEFINE="$t"
-- 
cgit v1.1