Author: randyk
Date: Mon Mar 14 21:55:55 2005
New Revision: 157522
URL: http://svn.apache.org/viewcvs?view=rev&rev=157522
Log:
remove overridden MakeMaker MOD_INSTALL macro, so 3rd party
modules will use MakeMaker's MOD_INSTALL, rather than invoking
ModPerl::MM::install.
Modified:
perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MM.pm
Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MM.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MM.pm?view=diff&r1=157521&r2=157522
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MM.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MM.pm Mon Mar 14
21:55:55 2005
@@ -53,13 +53,6 @@
};
}
-#to override MakeMaker MOD_INSTALL macro
-sub mod_install {
- # adding -MApache2 here so 3rd party modules could use this macro,
- q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MApache2 -MModPerl::MM \\}."\n" .
- q{-e "ModPerl::MM::install([EMAIL
PROTECTED],'$(VERBINST)',0,'$(UNINST)');"}."\n";
-}
-
sub add_dep {
my($string, $targ, $add) = @_;
$$string =~ s/($targ\s+::)/$1 $add/;
@@ -102,7 +95,7 @@
my @default_opts = qw(CCFLAGS LIBS INC OPTIMIZE LDDLFLAGS TYPEMAPS);
my @default_dlib_opts = qw(OTHERLDFLAGS);
-my @default_macro_opts = qw(MOD_INSTALL);
+my @default_macro_opts = ();
my $b = build_config();
my %opts = (
CCFLAGS => sub { $b->{MODPERL_CCOPTS} },
@@ -112,7 +105,6 @@
LDDLFLAGS => sub { $b->perl_config('lddlflags'); },
TYPEMAPS => sub { $b->typemaps; },
OTHERLDFLAGS => sub { $b->otherldflags; },
- MOD_INSTALL => \&ModPerl::MM::mod_install,
);
sub get_def_opt {
