dougm 02/04/05 22:41:54
Modified: . Makefile.PL
lib/ModPerl MM.pm
Log:
not everything in MakeMaker uses INST_LIB
so we have do fixup a few PMs to make sure *everything*
gets installed into Apache2/
Revision Changes Path
1.63 +0 -9 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Makefile.PL 6 Apr 2002 04:13:56 -0000 1.62
+++ Makefile.PL 6 Apr 2002 06:41:54 -0000 1.63
@@ -375,15 +375,6 @@
'';
}
-sub MY::post_initialize {
- my $self = shift;
-
- #up one from the Apache2/ subdir
- #so it can be found for 'use Apache2 ()'
- $self->{PM}->{'lib/Apache2.pm'} = "blib/lib/Apache2.pm";
- '';
-}
-
sub MY::manifypods {
my $self = shift;
my $ver = $self->{VERSION} || "";
1.15 +26 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- MM.pm 22 Oct 2001 01:38:06 -0000 1.14
+++ MM.pm 6 Apr 2002 06:41:54 -0000 1.15
@@ -125,6 +125,32 @@
$self->MM::constants;
}
+
+sub ModPerl::MM::MY::post_initialize {
+ my $self = shift;
+
+ my $build = build_config();
+
+ #not everything in MakeMaker uses INST_LIB
+ #so we have do fixup a few PMs to make sure *everything*
+ #gets installed into Apache2/
+ if ($build->{MP_INST_APACHE2}) {
+ my $pm = $self->{PM};
+
+ while (my($k, $v) = each %$pm) {
+ #up one from the Apache2/ subdir
+ #so it can be found for 'use Apache2 ()'
+ next if $v =~ /Apache2\.pm$/;
+
+ #move everything else to the Apache2/ subdir
+ $v =~ s,(blib/lib),$1/Apache2,;
+ $pm->{$k} = $v;
+ }
+ }
+
+ '';
+}
+
sub ModPerl::MM::MY::libscan {
my($self, $path) = @_;
