ld/

	* configure.in: Allow sysroots to be relocated under $prefix as
	well as $exec_prefix.
	* configure: Regenerate.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3cc0c85141c64dcc35a82883b5aa61930dfdbc58..19f66d36ee61ada985f0c5c18f46ea1463f836c9 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-16  Richard Sandiford  <richard@codesourcery.com>
+
+       * configure.in: Allow sysroots to be relocated under $prefix as
+       well as $exec_prefix.
+       * configure: Regenerate.
+
 2007-05-14  Andreas Schwab  <schwab@suse.de>
 
        * emultempl/ppc64elf.em (gld${EMULATION_NAME}_new_vers_pattern):

diff --git a/ld/configure b/ld/configure
index d34367de176f2deb93c63909e3d23f231b4e09fa..d825ecf0ab82f8960139475f31beabb3cdf09ae2 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -4198,17 +4198,20 @@ if test "${with_sysroot+set}" = set; then
  TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
  use_sysroot=yes
 
+ if test "x$prefix" = xNONE; then
+  test_prefix=/usr/local
+ else
+  test_prefix=$prefix
+ fi
  if test "x$exec_prefix" = xNONE; 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"

diff --git a/ld/configure.in b/ld/configure.in
index 3fd64c068f2cd9de6f263dfdbc173101c3a3bf90..0589578a74a67cb5ebf265fa647f1d8ae4bb799e 100644 (file)
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -41,17 +41,20 @@ AC_ARG_WITH(sysroot,
  TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"'
  use_sysroot=yes
 
+ if test "x$prefix" = xNONE; then
+  test_prefix=/usr/local
+ else
+  test_prefix=$prefix
+ fi
  if test "x$exec_prefix" = xNONE; 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"