Fix default value of libdir global

This was causing testsuite/runtest.main/stats.exp to fail unless the
DejaGnu sources were in a directory named dejagnu.

2 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2dd6cad..75266fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-28  Jacob Bachmeyer  <jcb62281+dev@gmail.com>
+
+	PR 41585
+	* runtest.exp (libdir): Fix default value of global variable.
+
 2020-05-26 Jacob Bachmeyer <jcb62281+dev@gmail.com>
 
     * doc/dejagnu.texi (target_compile procedure): Add documentation.
diff --git a/runtest.exp b/runtest.exp
index 6a53a56..9380732 100644
--- a/runtest.exp
+++ b/runtest.exp
@@ -700,7 +700,10 @@ verbose "Testsuite root is $testsuitedir"
 verbose "Tool root directory is $tool_root_dir"
 
 set execpath [file dirname $argv0]
-set libdir   [file dirname $execpath]/dejagnu
+
+# The runtest.exp file is installed directly in libdir.
+# Conveniently, the source tree layout is the same as the installed libdir.
+set libdir [file dirname $argv0]
 if {[info exists env(DEJAGNULIBS)]} {
     set libdir $env(DEJAGNULIBS)
 }