--- loncom/build/distprobe	2004/10/26 19:45:57	1.6
+++ loncom/build/distprobe	2007/04/23 20:04:52	1.12
@@ -2,7 +2,7 @@
 #
 # The LearningOnline Network with CAPA
 #
-# $Id: distprobe,v 1.6 2004/10/26 19:45:57 albertel Exp $
+# $Id: distprobe,v 1.12 2007/04/23 20:04:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,16 @@ if (-e '/etc/redhat-release') {
             $dist='redhat9';
         }
     } elsif ($versionstring =~ /Fedora Core release ([\d\.]+) /) {
-        $dist = 'fedora'.$1;
+	my $version=$1;
+	if ($version - int($version) > .9) {
+	    $dist = 'fedora'.(int($version)+1);
+	} else {
+	    $dist = 'fedora'.int($version);
+	}
+    } elsif ($versionstring =~ /Red Hat Enterprise Linux [AE]S release ([\d\.]+) /) {
+        $dist = 'rhes'.$1;
+    } elsif ($versionstring =~ /Red Hat Enterprise Linux Server release (\d+)/) {
+        $dist = 'rhes'.$1;
     } else {
         warn('Unable to interpret /etc/redhat-release '.
              'to determine system type');
@@ -61,9 +70,11 @@ if (-e '/etc/redhat-release') {
     my $versionstring=<IN>;
     chomp($versionstring);
     close(IN);
-    if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /) {
+    if ($versionstring =~ /^SUSE LINUX Enterprise Server ([\d\.]+) /i) {
         $dist='sles'.$1;
-    } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /) {
+    } elsif ($versionstring =~ /^SuSE Linux ([\d\.]+) /i) {
+        $dist = 'suse'.$1;
+    } elsif ($versionstring =~ /^openSUSE ([\d\.]+) /i) {
         $dist = 'suse'.$1;
     } else {
         warn('Unable to interpret /etc/SuSE-release '.