Update CPANPLUS-Dist-Build to CPAN version 0.52

[perl5.git] / symbian / xsbuild.pl

diff --git a/symbian/xsbuild.pl b/symbian/xsbuild.pl
index 84d0a63..939b569 100644 (file)
--- a/symbian/xsbuild.pl
+++ b/symbian/xsbuild.pl
@@ -6,6 +6,7 @@ use Getopt::Long;
 use File::Basename;
 use Cwd;
 
+unshift @INC, dirname $0 || '.';
 do "sanity.pl" or die $@;
 
 my $CoreBuild = -d "ext" && -f "perl.h" && -d "symbian" && -f "perl.c";
@@ -63,7 +64,6 @@ if ( !defined $SymbianVersion) {
 my ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION);
 
 if ($CoreBuild) {
-    unshift @INC, "symbian";
     do "sanity.pl" or die $@;
     my %VERSION = %{ do "version.pl" or die $@ };
     ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION) =
@@ -509,14 +509,14 @@ sub xsconfig {
         }
     }
     if ( my @c = glob("*.c *.cpp */*.c */*.cpp") ) {
-       @c = grep { ! m:^zlib-src/: } @c if $ext eq 'ext\Compress\Raw\Zlib';
+       map { s:^zlib-src/:: } @c if $ext eq 'ext\Compress\Raw\Zlib';
         for my $c (@c) {
             $c =~ s:/:\\:g;
             $src{$c}++;
         }
     }
     if ( my @h = glob("*.h */*.h") ) {
-        @h = grep { ! m:^zlib-src/: } @h if $ext eq 'ext\Compress\Raw\Zlib';
+        map { s:^zlib-src/:: } @h if $ext eq 'ext\Compress\Raw\Zlib';
         for my $h (@h) {
             $h =~ s:/:\\:g;
             $h = dirname($h);