Fix building MAD with C++ - a MAD_PV of "" is illegal, as it will be free()d.

[p5sagit/p5-mst-13.2.git] / symbian / sanity.pl

diff --git a/symbian/sanity.pl b/symbian/sanity.pl
index 4d00ac0..6487c57 100644 (file)
--- 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") {