--- libgloss.exp	2004-11-21 00:30:43.000000000 -0500
+++ /usr/share/dejagnu/libgloss.exp	2004-11-28 10:02:13.938987688 -0500
@@ -711,21 +698,25 @@ proc find_g77 {} {
 proc find_gnatmake {} {
     global tool_root_dir
 
-    set root "$tool_root_dir/gcc"
-    set GM ""
-
     if ![is_remote host] {
-        set file [lookfor_file $root gnatmake]
-        if { $file != "" } {
-            set GM "$file -I$root/ada/rts --GCC=$root/xgcc --GNATBIND=$root/gnatbind --GNATLINK=$root/gnatlink -cargs -B$root -largs --GCC=$root/xgcc -margs";
-        }
-    }
-
-    if {$GM == ""} {
-        set GM [transform gnatmake]
+	set file [lookfor_file $tool_root_dir gnatmake]
+	set GB [lookfor_file $tool_root_dir gnatbind]
+	set GL [lookfor_file $tool_root_dir gnatlink]
+	set GCC [find_gcc]
+	if { $file == "" } {
+	    set file [lookfor_file $tool_root_dir gcc/gnatmake]
+            set GB [lookfor_file $tool_root_dir gcc/gnatbind]
+	    set GL [lookfor_file $tool_root_dir gcc/gnatlink]
+	}
+	if { $file != "" } {
+	    set CC "$file --GCC=$GCC --GNATBIND=$GB --GNATLINK=$GL -cargs -B[file dirname $file]/ -largs --GCC=$GCC -margs"
+	} else {
+	    set CC [transform gnatmake]
+	}
+    } else {
+	set CC [transform gnatmake]
     }
-
-    return $GM
+    return $CC
 }
 
 proc find_nm {} {