[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-modperl-cvs
Subject:    svn commit: r157515 - in perl/modperl/branches/apache2-rename-unstable:
From:       randyk () apache ! org
Date:       2005-03-15 5:12:59
Message-ID: 20050315051259.31782.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: randyk
Date: Mon Mar 14 21:12:55 2005
New Revision: 157515

URL: http://svn.apache.org/viewcvs?view=rev&rev=157515
Log:
synch with trunk change:
    http://svn.apache.org/viewcvs?view=rev&rev=157373

Modified:
    perl/modperl/branches/apache2-rename-unstable/Changes
    perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/BuildMM.pm

Modified: perl/modperl/branches/apache2-rename-unstable/Changes
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/Changes?view=diff&r1=157514&r2=157515
 ==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/Changes (original)
+++ perl/modperl/branches/apache2-rename-unstable/Changes Mon Mar 14 21:12:55 2005
@@ -37,9 +37,13 @@
 if $r->document_root was modified, restore it at the end of request
 [joes]
 
+Starting from ExtUtils::MakeMaker 6.26 went back to pm_to_blib target
+from pm_to_blib.ts introduced in 6.22, so needed to fix the glue_pod
+target, so install will work correctly [Stas]
+
 Syntax errors in <Perl> sections were not correctly caught and
 reported. [Gozer]
-                                                                                     \
 +                             
 when building mp2 EU::MM looks into Apache-Test/MANIFEST and complains
 about the missing Apache-Test/META.yml (which is indeed not included
 in the modperl package due to the PAUSE problems of dealing with more

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/BuildMM.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/BuildMM.pm?view=diff&r1=157514&r2=157515
 ==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/BuildMM.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/BuildMM.pm Mon Mar 14 \
21:12:55 2005 @@ -188,7 +188,8 @@
     # create a dependency on pm_to_blib subdirs linkext targets to
     # allow 'make -j'
     require ExtUtils::MakeMaker;
-    my $pm_to_blib = $ExtUtils::MakeMaker::VERSION >= 6.22
+    my $pm_to_blib = ($ExtUtils::MakeMaker::VERSION >= 6.22 &&
+                      $ExtUtils::MakeMaker::VERSION <= 6.25 )
         ? "pm_to_blib.ts"
         : "pm_to_blib";
     my @target = ("glue_pods: $pm_to_blib subdirs linkext");


[prev in list] [next in list] [prev in thread] [next in thread]