X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=util%2Fselftest.pl;h=e9d5aa8938ec3d1f2d3f9fa82d49b68ef0ff86a7;hp=b0f26fc731c5afe6d561aae5010c3962fc0db141;hb=69af4faec187b1e589c0328cea79054469ca06d0;hpb=8700e7b3cfa09137bf553d6daae9fb1564c4539f

diff --git a/util/selftest.pl b/util/selftest.pl
index b0f26fc731..e9d5aa8938 100644
--- a/util/selftest.pl
+++ b/util/selftest.pl
@@ -34,9 +34,9 @@ foreach $_ (split("\n",$c)) {
     $platform0=$1 if (/Configuring for (.*)$/);
 }
 
-system "sh config" if (! -f "Makefile.ssl");
+system "sh config" if (! -f "Makefile");
 
-if (open(IN,"<Makefile.ssl")) {
+if (open(IN,"<Makefile")) {
     while (<IN>) {
 	$version=$1 if (/^VERSION=(.*)$/);
 	$platform=$1 if (/^PLATFORM=(.*)$/);
@@ -50,6 +50,7 @@ if (open(IN,"<Makefile.ssl")) {
 
 $cversion=`$cc -v 2>&1`;
 $cversion=`$cc -V 2>&1` if $cversion =~ "usage";
+$cversion=`$cc -V |head -1` if $cversion =~ "Error";
 $cversion=`$cc --version` if $cversion eq "";
 $cversion =~ s/Reading specs.*\n//;
 $cversion =~ s/usage.*\n//;
@@ -57,7 +58,7 @@ chomp $cversion;
 
 if (open(IN,"<CHANGES")) {
     while(<IN>) {
-	if (/\*\) (.{0,55})/) {
+	if (/\*\) (.{0,55})/ && !/applies to/) {
 	    $last=$1;
 	    last;
 	}