[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.360,1.361

[Ken W. <kwi...@us...>]

Update of /cvsroot/module-build/Module-Build/lib/Module/Build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8614/lib/Module/Build

Modified Files:
	Base.pm 
Log Message:
Integrate from branch

Index: Base.pm
===================================================================
RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v
retrieving revision 1.360
retrieving revision 1.361
diff -C2 -d -r1.360 -r1.361
*** Base.pm	12 Dec 2004 04:12:19 -0000	1.360
--- Base.pm	13 Dec 2004 04:37:42 -0000	1.361
***************
*** 965,969 ****
  
  # Return any directories in @INC which are not in the default @INC for
! # this Perl.  For example, stuff passed in with -I or loaded with "use lib".
  sub _added_to_INC {
    my $self = shift;
--- 965,969 ----
  
  # Return any directories in @INC which are not in the default @INC for
! # this perl.  For example, stuff passed in with -I or loaded with "use lib".
  sub _added_to_INC {
    my $self = shift;
***************
*** 980,986 ****
    local $ENV{PERL5LIB};  # this is not considered part of the default.
  
!   my $perl = $self->perl;
  
!   my @inc =`$perl -le "print for \@INC"`;
    chomp @inc;
  
--- 980,986 ----
    local $ENV{PERL5LIB};  # this is not considered part of the default.
  
!   my $perl = ref($self) ? $self->perl : $self->find_perl_interpreter;
  
!   my @inc = `$perl -le "print for \@INC"`;
    chomp @inc;
  
***************
*** 1480,1484 ****
    
    while (my ($file, $to) = each %$files) {
-     local $ENV{'PERL5LIB'} = join $self->{config}{path_sep}, @INC;
      unless ($self->up_to_date( $file, $to )) {
        $self->run_perl_script($file, [], [@$to]);
--- 1480,1483 ----
***************
*** 2120,2124 ****
    # XXX could be different names for scripts
    
-   local $ENV{'PERL5LIB'} = join $self->{config}{path_sep}, @INC;
    $self->run_perl_script('Build.PL') or die "Error executing 'Build.PL' in dist directory: $!";
    $self->run_perl_script('Build') or die "Error executing 'Build' in dist directory: $!";
--- 2119,2122 ----
***************
*** 2628,2632 ****
    }
    my $perl = ref($self) ? $self->perl : $self->find_perl_interpreter;
!   
    return $self->do_system($perl, @$preargs, $script, @$postargs);
  }
--- 2626,2634 ----
    }
    my $perl = ref($self) ? $self->perl : $self->find_perl_interpreter;
! 
!   # Make sure our local additions to @INC are propagated to the subprocess
!   my $c = ref $self ? $self->config : \%Config::Config;
!   local $ENV{PERL5LIB} = join $c->{path_sep}, $self->_added_to_INC;
! 
    return $self->do_system($perl, @$preargs, $script, @$postargs);
  }