perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0/lib/ModPerl BuildMM.pm
Date Wed, 21 May 2003 06:46:40 GMT
stas        2003/05/20 23:46:40

  Modified:    lib/ModPerl BuildMM.pm
  Log:
  cleanup the code that generates the glue_pods target
  
  Revision  Changes    Path
  1.10      +5 -11     modperl-2.0/lib/ModPerl/BuildMM.pm
  
  Index: BuildMM.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/BuildMM.pm,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- BuildMM.pm	15 May 2003 03:29:09 -0000	1.9
  +++ BuildMM.pm	21 May 2003 06:46:40 -0000	1.10
  @@ -19,6 +19,8 @@
   ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
   use strict 'refs';
   
  +my $apache_test_dir = File::Spec->catdir(Cwd::getcwd(), "Apache-Test", "lib");
  +
   #to override MakeMaker MOD_INSTALL macro
   sub mod_install {
       q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MModPerl::BuildMM \\}."\n" .
  @@ -139,21 +141,13 @@
   
   sub ModPerl::BuildMM::MY::postamble {
       my $self = shift;
  -    my $build = build_config();
  -
  -    my $root = $build->{cwd};
   
  -    my $doc_root = File::Spec->catdir($root, "docs", "api");
  -
  -    my $lib_dir         = File::Spec->catdir($root, "lib");
  -    my $apache_test_dir = File::Spec->catdir($root, "Apache-Test", "lib");
  +    my $doc_root = File::Spec->catdir(Cwd::getcwd(), "docs", "api");
   
       my @targets = ();
  -    my @target;
   
       # add the code to glue the existing pods to the .pm files in blib
  -
  -    @target = ('glue_pods:');
  +    my @target = ('glue_pods:');
   
       if (-d $doc_root) {
           while (my ($pm, $blib) = each %{$self->{PM}}) {
  @@ -164,7 +158,7 @@
               next unless -r $podpath;
   
               push @target, 
  -                "\$(FULLPERL) -I$lib_dir " .
  +                '$(FULLPERL) -I$(INST_LIB) ' .
                   "-I$apache_test_dir -MModPerl::BuildMM " .
                   "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";
           }
  
  
  

Mime
View raw message