Extend search path for config.guess to include $libdir/../../libexec.

This is where an install from the top level build directory will place it,
because the top level Makefile overrides the definition of $(libexecdir).

diff --git a/dejagnu/ChangeLog b/dejagnu/ChangeLog
index a498a33..bbe8aba 100644 (file)
--- a/dejagnu/ChangeLog
+++ b/dejagnu/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-28  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * runtest.exp: Extend search path for config.guess to include
+       $libdir/../../libexec.  This is where an install from the top
+       level build directory will place it, because the top level
+       Makefile overrides the definition of $(libexecdir).
+
 2002-06-18  Dave Brolley  <brolley@redhat.com>
 
        From Catherine Moore, Michael Meissner, Mark Salter, Jim Blandy:

diff --git a/dejagnu/runtest.exp b/dejagnu/runtest.exp
index 829266c..64fdf9d 100644 (file)
--- a/dejagnu/runtest.exp
+++ b/dejagnu/runtest.exp
@@ -677,7 +677,7 @@ unset arg_host_triplet arg_build_triplet
 
 if [expr  { $build_triplet == ""  &&  $host_triplet == ""} ] {
     # find config.guess
-    foreach dir "$libdir $libdir/libexec $libdir/.. $execpath $srcdir $srcdir/.. $srcdir/../.." {
+    foreach dir "$libdir $libdir/libexec $libdir/.. $libdir/../../libexec $execpath $srcdir $srcdir/.. $srcdir/../.." {
        verbose "Looking for ${dir}/config.guess" 2
        if [file exists ${dir}/config.guess] {
            set config_guess ${dir}/config.guess