perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tors...@apache.org
Subject svn commit: r987866 - in /perl/modperl/branches/threading: ./ Changes Makefile.PL
Date Sun, 22 Aug 2010 11:25:55 GMT
Author: torsten
Date: Sun Aug 22 11:25:55 2010
New Revision: 987866

URL: http://svn.apache.org/viewvc?rev=987866&view=rev
Log:
Merged revisions 985740 via svnmerge from 
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk

........
  r985740 | torsten | 2010-08-15 21:21:54 +0200 (Sun, 15 Aug 2010) | 1 line
  
  Support for "install_vendor" and "install_site" make targets
........

Modified:
    perl/modperl/branches/threading/   (props changed)
    perl/modperl/branches/threading/Changes
    perl/modperl/branches/threading/Makefile.PL

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 22 11:25:55 2010
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Aug 22 11:25:55 2010
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-985297
+/perl/modperl/trunk:1-712967,712969-987865

Modified: perl/modperl/branches/threading/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=987866&r1=987865&r2=987866&view=diff
==============================================================================
--- perl/modperl/branches/threading/Changes (original)
+++ perl/modperl/branches/threading/Changes Sun Aug 22 11:25:55 2010
@@ -31,6 +31,8 @@ Expose modperl_interp_t via ModPerl::Int
 
 =item 2.0.5-dev
 
+Support for "install_vendor" and "install_site" make targets [Torsten]
+
 Run tests on bundled pure perl Apache::* modules [Gozer, Phred]
 
 Implement a mini-preprocess language for map-files in xs/maps.

Modified: perl/modperl/branches/threading/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/Makefile.PL?rev=987866&r1=987865&r2=987866&view=diff
==============================================================================
--- perl/modperl/branches/threading/Makefile.PL (original)
+++ perl/modperl/branches/threading/Makefile.PL Sun Aug 22 11:25:55 2010
@@ -725,20 +725,23 @@ EOF
 sub MY::install {
     my $self = shift;
     my $string = $self->MM::install(@_);
-    ModPerl::MM::add_dep(\$string, pure_install => 'ap_install') 
-        if $build->should_build_apache;
-    ModPerl::MM::add_dep(\$string, pure_install => 'modperl_lib_install');
-    ModPerl::MM::add_dep(\$string, pure_install => 'modperl_xs_h_install');
-    # ModPerl::MM::add_dep(\$string, pure_install => 'aprext_install')
-    #    if BUILD_APREXT;
 
-    ModPerl::MM::add_dep(\$string, pure_install => 'nuke_Apache__test')
-          if $apache_test_install;
+    for my $kind ('', '_site', '_vendor') {
+        ModPerl::MM::add_dep(\$string, "pure${kind}_install" => 'ap_install')
+	    if $build->should_build_apache;
+	ModPerl::MM::add_dep(\$string, "pure${kind}_install" => 'modperl_lib_install');
+	ModPerl::MM::add_dep(\$string, "pure${kind}_install" => 'modperl_xs_h_install');
+	# ModPerl::MM::add_dep(\$string, "pure${kind}_install" => 'aprext_install')
+	#    if BUILD_APREXT;
 
-    ModPerl::MM::add_dep_after(\$string, qw(install doc_install modperl_banner));
+	ModPerl::MM::add_dep(\$string, "pure${kind}_install" => 'nuke_Apache__test')
+	    if $apache_test_install;
 
-    # glue_pods target must come first
-    ModPerl::MM::add_dep(\$string, pure_install => 'glue_pods');
+	ModPerl::MM::add_dep_after(\$string, "install$kind", "doc${kind}_install", 'modperl_banner');
+
+	# glue_pods target must come first
+	ModPerl::MM::add_dep(\$string, "pure${kind}_install" => 'glue_pods');
+    }
 
     $string;
 }



Mime
View raw message