Installed runtest.exp cannot find config.guess

[Nick Clifton <nickc at cambridge dot redhat dot com>]

Hi Rob,

  We have discovered a problem with the sourceware copy of the dejagnu
  sources.  If the dejagnu package is installed by running:

        make install-dejagnu

  from the top level of the build directory (ie outside of the dejagnu
  directory) then the config.guess script gets installed into:

        $(exec_prefix)/libexec

  instead of:

        $(pkgdatadir)/libexec

  This is because the top level Makefile overrides the definition of
  libexecdir.  If the install is run from inside the dejagnu directory
  as:

        make install

  then config.guess is installed into the expected place.

  Installing config.guess to $(exec_prefix)/libexec causes problems
  because runtest.exp does not search this directory and so it fails
  to execute.  The patch below adds this directory to runtest.exp's
  search path.  Do you agree with this solution to the problem, and if
  so, please can the patch be applied ?

Cheers
        Nick

2002-06-13  Nick Clifton  <nickc@cambridge.redhat.com>

	* runtest.exp (find config.guess): Also check in a libexec
	directory created at the top level of the installed tree.
	This location can be created by an installation that overrode
	the definition of libexecdir and replaced it with
	$(exec_prefix)/libexec.

Index: runtest.exp
===================================================================
RCS file: /cvsroot/dejagnu/dejagnu/runtest.exp,v
retrieving revision 1.10
diff -c -3 -p -w -r1.10 runtest.exp
*** runtest.exp	26 Apr 2002 05:29:34 -0000	1.10
--- runtest.exp	13 Jun 2002 11:07:27 -0000
*************** unset arg_host_triplet arg_build_triplet
*** 683,689 ****
  
  if [expr  { $build_triplet == ""  &&  $host_triplet == ""} ] {
      # find config.guess
!     foreach dir "$libdir $libdir/libexec $libdir/.. $execpath $srcdir $srcdir/.. $srcdir/../.." {
  	verbose "Looking for ${dir}/config.guess" 2
  	if [file exists ${dir}/config.guess] {
  	    set config_guess ${dir}/config.guess
--- 683,689 ----
  
  if [expr  { $build_triplet == ""  &&  $host_triplet == ""} ] {
      # find config.guess
!     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