--- loncom/build/distprobe	2005/07/18 15:10:11	1.8
+++ loncom/build/distprobe	2007/06/28 13:30:06	1.14
@@ -2,7 +2,7 @@
 #
 # The LearningOnline Network with CAPA
 #
-# $Id: distprobe,v 1.8 2005/07/18 15:10:11 raeburn Exp $
+# $Id: distprobe,v 1.14 2007/06/28 13:30:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,15 +42,21 @@ if (-e '/etc/redhat-release') {
         } elsif ($version=~/^9/) {
             $dist='redhat9';
         }
-    } elsif ($versionstring =~ /Fedora Core release ([\d\.]+) /) {
-	my $version=$1;
+    } elsif ($versionstring =~ /Fedora( Core)? release ([\d\.]+) /) {
+	my $version=$2;
 	if ($version - int($version) > .9) {
 	    $dist = 'fedora'.(int($version)+1);
 	} else {
 	    $dist = 'fedora'.int($version);
 	}
-    } elsif ($versionstring =~ /Red Hat Enterprise Linux ES release ([\d\.]+) /) {
+    } 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;
+    } elsif ($versionstring =~ /CentOS release (\d+)/) {
+        $dist = 'centos'.$1;
+    } elsif ($versionstring =~ /Scientific Linux SL release ([\d\.]+) /) {
+        $dist = 'scientific'.$1;
     } else {
         warn('Unable to interpret /etc/redhat-release '.
              'to determine system type');
@@ -68,9 +74,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 '.