dougm 02/04/06 08:11:56
Modified: . Makefile.PL
lib/ModPerl MM.pm
Log:
install xs/typemap to Apache2/typemap
Revision Changes Path
1.66 +4 -0 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Makefile.PL 6 Apr 2002 15:44:09 -0000 1.65
+++ Makefile.PL 6 Apr 2002 16:11:56 -0000 1.66
@@ -57,6 +57,10 @@
configure();
+local %ModPerl::MM::PM = (
+ 'xs/typemap' => 'blib/lib/Apache2/typemap',
+);
+
ModPerl::MM::WriteMakefile(
NAME => 'mod_perl',
VERSION => $VERSION,
1.16 +15 -3 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- MM.pm 6 Apr 2002 06:41:54 -0000 1.15
+++ MM.pm 6 Apr 2002 16:11:56 -0000 1.16
@@ -7,6 +7,8 @@
use Cwd ();
use Apache::Build ();
+our %PM; #add files to installation
+
#to override MakeMaker MOD_INSTALL macro
sub mod_install {
q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MModPerl::MM \\}."\n" .
@@ -130,20 +132,30 @@
my $self = shift;
my $build = build_config();
+ my $pm = $self->{PM};
+
+ while (my($k,$v) = each %PM) {
+ if (-e $k) {
+ $pm->{$k} = $v;
+ }
+ }
#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,;
+ #unless already specified with \$(INST_LIB)
+ #or already in Apache2/
+ unless ($v =~ /Apache2/) {
+ $v =~ s,(blib/lib),$1/Apache2,;
+ }
+
$pm->{$k} = $v;
}
}
