X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=symbian%2Fsanity.pl;h=6487c575c354975e4e6508528ed3c33729a84fa8;hb=a22f28a4268aa03ce2bafaf594271b8ff764a5f8;hp=4d00ac0532c8862d8aed9cf15ce6725876ac80e3;hpb=25ca88e0cbd385e70d7ea2ee4f8a34a9ff7bcc17;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/symbian/sanity.pl b/symbian/sanity.pl
index 4d00ac0..6487c57 100644
--- a/symbian/sanity.pl
+++ b/symbian/sanity.pl
@@ -3,21 +3,24 @@ use strict;
 if (exists $ENV{'!C:'}) {
   print "You are running this under Cygwin, aren't you? (found '!C' in %ENV)\n";
   print "Are you perhaps using Cygwin Perl? (\$^O is '$^O')\n" if $^O =~ /cygwin/;
-  print "I'm sorry but only cmd.exe will work.\n";
+  print "I'm sorry but only cmd.exe with e.g. the ActivePerl will work.\n";
   exit(1);
 }
 
-if (# S60 2.x or S80 2.x
-    $ENV{PATH} !~ m!\\program files\\common files\\symbian\\tools!i
-    &&
-    # S60 1.2
-    $ENV{PATH} !~ m!\\symbian\\6.1\\shared\\epoc32\\tools!i
-    &&
-    # UIQ
-    $ENV{PATH} !~ m!\\symbian\\uiq.+?\\epoc32!i
-    ) {
-  print "I do not think you have installed the Symbian SDK.\n";
-  exit(1);
+unless(# S60 2.x
+       $ENV{PATH} =~ m!\\program files\\common files\\symbian\\tools!i
+       ||
+       # S60 1.2
+       $ENV{PATH} =~ m!\\symbian\\6.1\\shared\\epoc32\\tools!i
+       ||
+       # S80
+       $ENV{PATH} =~ m!\\s80_.+?\\epoc32\\!i
+       ||
+       # UIQ
+       $ENV{PATH} =~ m!\\uiq_.+?\\epoc32\\!i
+       ) {
+    print "I do not think you have installed a Symbian SDK, your PATH is:\n$ENV{PATH}\n";
+    exit(1);
 }
 
 unless (-f "symbian/symbianish.h") {