cvs commit: modperl-2.0/lib/Apache Build.pm

[dougm]

dougm       01/10/16 13:59:15

  Modified:    lib/Apache Build.pm
  Log:
  make MakeMaker pieces use our variable names
  
  Revision  Changes    Path
  1.53      +14 -3     modperl-2.0/lib/Apache/Build.pm
  
  Index: Build.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- Build.pm  2001/10/15 17:33:03     1.52
  +++ Build.pm  2001/10/16 20:59:15     1.53
  @@ -682,9 +682,18 @@
       \@xs_targ;
   }
   
  +#when we use a bit of MakeMaker, make it use our values for these vars
  +my %perl_config_pm_alias = (
  +    PERL         => 'perlpath',
  +    PERL_LIB     => 'privlibexp',
  +    PERL_ARCHLIB => 'archlibexp',
  +);
  +
  +my $mm_replace = join '|', keys %perl_config_pm_alias;
  +
   my @perl_config_pm =
  -  qw(cc cpprun ld ar rm ranlib lib_ext dlext cccdlflags lddlflags
  -     perlpath privlibexp);
  +  (qw(cc cpprun ld ar rm ranlib lib_ext dlext cccdlflags lddlflags),
  +   values %perl_config_pm_alias);
   
   sub make_tools {
       my($self, $fh) = @_;
  @@ -703,7 +712,9 @@
       $mm->init_others;
   
       for (qw(RM_F MV)) {
  -        print $fh $self->canon_make_attr($_ => $mm->{$_});
  +        my $val = $mm->{$_};
  +        $val =~ s/\(($mm_replace)\)/(MODPERL_\U$perl_config_pm_alias{$1})/g;
  +        print $fh $self->canon_make_attr($_ => $val);
       }
   }