svn commit: r985740 - in /perl/modperl/trunk: Changes Makefile.PL

[to...@apache.org]

Author: torsten
Date: Sun Aug 15 19:21:54 2010
New Revision: 985740

URL: http://svn.apache.org/viewvc?rev=985740&view=rev
Log:
Support for "install_vendor" and "install_site" make targets

Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/Makefile.PL

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=985740&r1=985739&r2=985740&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sun Aug 15 19:21:54 2010
@@ -12,6 +12,8 @@ Also refer to the Apache::Test changes l
 
 =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/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Makefile.PL?rev=985740&r1=985739&r2=985740&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Sun Aug 15 19:21:54 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;
 }