cvs commit: modperl-2.0/lib/ModPerl MM.pm

[stas]

stas        2003/03/24 18:20:56

  Modified:    lib/ModPerl MM.pm
  Log:
  supply a default for macro->{MOD_INSTALL}
  Submitted by: geoff
  
  Revision  Changes    Path
  1.28      +9 -0      modperl-2.0/lib/ModPerl/MM.pm
  
  Index: MM.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/MM.pm,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- MM.pm     24 Mar 2003 05:43:51 -0000      1.27
  +++ MM.pm     25 Mar 2003 02:20:56 -0000      1.28
  @@ -101,6 +101,7 @@
   
   my @default_opts = qw(CCFLAGS LIBS INC OPTIMIZE LDDLFLAGS TYPEMAPS);
   my @default_dlib_opts = qw(OTHERLDFLAGS);
  +my @default_macro_opts = qw(MOD_INSTALL);
   my $b = build_config();
   my %opts = (
       CCFLAGS      => sub { $b->perl_ccopts . $b->ap_ccopts             },
  @@ -110,6 +111,7 @@
       LDDLFLAGS    => sub { $b->perl_config('lddlflags');               },
       TYPEMAPS     => sub { $b->typemaps;                               },
       OTHERLDFLAGS => sub { $b->otherldflags;                           },
  +    MOD_INSTALL  => \&ModPerl::MM::mod_install,
   );
   
   sub get_def_opt {
  @@ -145,6 +147,13 @@
       my $dlib = $args{dynamic_lib};
       for (@default_dlib_opts) {
           $dlib->{$_} = get_def_opt($_) unless exists $dlib->{$_};
  +    }
  +
  +    # set macro-level WriteMakefile's values if weren't set already
  +    $args{macro} ||= {};
  +    my $macro = $args{macro};
  +    for (@default_macro_opts) {
  +        $macro->{$_} = get_def_opt($_) unless exists $macro->{$_};
       }
   
       ExtUtils::MakeMaker::WriteMakefile(%args);