[Maxima-commits] CVS: maxima/interfaces/xmaxima xmaxima-paths.tcl,1.15,1.16

[Mike C. <mik...@us...>]

Update of /cvsroot/maxima/maxima/interfaces/xmaxima
In directory usw-pr-cvs1:/tmp/cvs-serv32307

Modified Files:
	xmaxima-paths.tcl 
Log Message:
Look for maxima.exe on windows in lib/ - need autoconf(lisp) so we dont need to use glob

Index: xmaxima-paths.tcl
===================================================================
RCS file: /cvsroot/maxima/maxima/interfaces/xmaxima/xmaxima-paths.tcl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- xmaxima-paths.tcl	11 Sep 2002 01:19:38 -0000	1.15
+++ xmaxima-paths.tcl	12 Sep 2002 06:58:01 -0000	1.16
@@ -24,8 +24,8 @@
 		[info exists autoconf(package)] && \
 		[file isdir  $autoconf(datadir)] && \
 		[file isdir \
-		  [file join $autoconf(datadir) \
-		   $autoconf(package) $autoconf(version)]]} {
+		     [file join $autoconf(datadir) \
+			  $autoconf(package) $autoconf(version)]]} {
 
 	    # Assume it's CYGWIN or  MSYS in /usr/local
 	} elseif {[file isdir $up/lib] && \
@@ -176,7 +176,7 @@
     set maxima_opts [lMaxInitSetOpts]
 
     if {[info exists maxima_priv(xmaxima_maxima)] && \
-	$maxima_priv(xmaxima_maxima) != ""} {
+	    $maxima_priv(xmaxima_maxima) != ""} {
 	if {[set exe [auto_execok $maxima_priv(xmaxima_maxima)]] == "" } {
 
 	    tide_failure [M "Error: Maxima executable not found\n%s\n\n Try setting the environment variable  XMAXIMA_MAXIMA." \
@@ -195,15 +195,19 @@
 	if {[set exe [auto_execok $maxima_priv(xmaxima_maxima)]] == "" } {
 	    
 	    if {$tcl_platform(platform) == "windows"} {
-		# maybe it's in maxima_priv(maxima_verpkglibdir)
-		set exe [file join $maxima_priv(maxima_verpkglibdir) maxima.exe]
-		if {![file isfile $exe]} {
+		# maybe it's in lib - I don't like this
+		set dir $maxima_priv(maxima_verpkglibdir)
+		# FIXME - need autoconf(lisp) so we don't need glob
+		set exes [glob -nocomplain $dir/binary-*/maxima.exe]
+		if {[llength $exes] != "1" || \
+			[set exe [lindex $exes 0]] == "" || \
+			![file isfile $exe]} {
 		    tide_failure [M "Error: Maxima executable not found\n\n Try setting the environment variable  XMAXIMA_MAXIMA."]
 		    return
 		}
 
 	    } else {
-		    tide_failure [M "Error: Maxima executable not found\n\n Try setting the environment variable  XMAXIMA_MAXIMA."]
+		tide_failure [M "Error: Maxima executable not found\n\n Try setting the environment variable  XMAXIMA_MAXIMA."]
 	    }
 	}
     }