diff options
| author | Daniel Jacobowitz <dan@debian.org> | 2007-01-09 21:34:30 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <dan@debian.org> | 2007-01-09 21:34:30 +0000 |
| commit | 91549c1328ffaba50c1992c9e48ce149502e05d3 (patch) | |
| tree | 77686b3d2790efc103b6921c70982005968a449f /gdb/configure.ac | |
| parent | afac92b60e4b887653003e619d6fcf5afface874 (diff) | |
| download | gdb-91549c1328ffaba50c1992c9e48ce149502e05d3.tar.gz | |
* configure.ac (DEBUGDIR_RELOCATABLE): Define for debugdir inside
exec_prefix.
(TARGET_SYSTEM_ROOT_RELOCATABLE): Allow for exec_prefix being
'${prefix}'.
* configure, config.in: Regenerate.
* defs.h (debug_file_directory): Declare.
* main.c (captured_main): Canonicalize gdb_sysroot. Assume
TARGET_SYSTEM_ROOT is defined. Initialize debug_file_directory and
relocate it if DEBUGDIR_RELOCATABLE.
* symfile.c (debug_file_directory): Make non-static.
(find_separate_debug_file): Look for debug info for SYSROOT/PATH
in DEBUGDIR/PATH if DEBUGDIR is inside SYSROOT.
(_initialize_symfile): Don't initialize debug_file_directory here.
Diffstat (limited to 'gdb/configure.ac')
| -rw-r--r-- | gdb/configure.ac | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/gdb/configure.ac b/gdb/configure.ac index 3a55c515735..f0ce4629a67 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -75,6 +75,22 @@ AC_DEFINE_DIR(DEBUGDIR, debugdir, [Global directory for separate debug files. ]) #AC_DEFINE_UNQUOTED(DEBUGDIR, "$debugdir"), +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 +else + test_prefix=$exec_prefix +fi +case ${debugdir} in +"${test_prefix}"|"${test_prefix}/"*|\ +'${exec_prefix}'|'${exec_prefix}/'*) + AC_DEFINE(DEBUGDIR_RELOCATABLE, 1, [Define if the debug directory should be relocated when GDB is moved.]) + ;; +esac + AC_CONFIG_SUBDIRS(doc testsuite) # Provide defaults for some variables set by the per-host and per-target @@ -1102,7 +1118,7 @@ AC_ARG_WITH(sysroot, TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' - if test "x$exec_prefix" = xNONE; then + if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then if test "x$prefix" = xNONE; then test_prefix=/usr/local else |