--- loncom/build/distprobe	2007/06/28 13:30:06	1.14
+++ loncom/build/distprobe	2009/06/28 14:22:04	1.15
@@ -2,7 +2,7 @@
 #
 # The LearningOnline Network with CAPA
 #
-# $Id: distprobe,v 1.14 2007/06/28 13:30:06 raeburn Exp $
+# $Id: distprobe,v 1.15 2009/06/28 14:22:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,13 +61,40 @@ if (-e '/etc/redhat-release') {
         warn('Unable to interpret /etc/redhat-release '.
              'to determine system type');
     }
+} elsif (-e '/etc/issue') {
+    open(IN,'</etc/issue');
+    my $versionstring=<IN>;
+    chomp($versionstring);
+    close(IN);
+    if ($versionstring =~ /^Ubuntu (\d+)\.\d+/i) {
+        $dist = 'ubuntu'.$1;
+    } elsif ($versionstring =~ /^Debian\s+GNU\/Linux\s+(\d+)\.\d+/i) {
+        $dist = 'debian'.$1;
+    } elsif (-e '/etc/debian_version') {
+        open(IN,'</etc/debian_version');
+        my $version=<IN>;
+        chomp($version);
+        close(IN);
+        if ($version =~  /^(\d+)\.\d+\.?\d*/) {
+            $dist='debian'.$1;
+        } else {
+            warn('Unable to interpret /etc/debian_version '.
+                 'to determine system type');
+        }
+    } else {
+        warn('Unable to interpret /etc/issue '.
+             'to determine system type');
+    }
 } elsif (-e '/etc/debian_version') {
     open(IN,'</etc/debian_version');
     my $version=<IN>;
     chomp($version);
     close(IN);
-    if ($version eq '2.2') {
-	$dist='debian2.2';
+    if ($version =~  /^(\d+)\.\d+\.?\d*/) {
+        $dist='debian'.$1;
+    } else {
+        warn('Unable to interpret /etc/debian_version '.
+             'to determine system type');
     }
 } elsif (-e '/etc/SuSE-release') {
     open(IN,'</etc/SuSE-release');