stas 01/09/10 00:00:56
Modified: . Makefile.PL
Log:
- define APACHE_PREFIX/APACHE_LIBDIR Makefile vars for install target
re-use
- install libmodperl.so if built with MP_USE_DSO=1
Revision Changes Path
1.38 +15 -3 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile.PL 2001/08/08 16:38:07 1.37
+++ Makefile.PL 2001/09/10 07:00:56 1.38
@@ -23,9 +23,11 @@
NAME => 'mod_perl',
VERSION => $VERSION,
macro => {
- MODPERL_SRC => $code->path,
- PERL => $build->perl_config('perlpath'),
- MOD_INSTALL => ModPerl::MM::mod_install(),
+ MODPERL_SRC => $code->path,
+ PERL => $build->perl_config('perlpath'),
+ MOD_INSTALL => ModPerl::MM::mod_install(),
+ APACHE_PREFIX => $build->apxs('-q' => 'prefix'),
+ APACHE_LIBDIR => $build->apxs('-q' => 'libexecdir'),
},
clean => {
FILES => "@{ clean_files() }",
@@ -193,6 +195,8 @@
package MY;
+use Config;
+
sub MY::top_targets {
my $self = shift;
my $string = $self->MM::top_targets;
@@ -239,6 +243,14 @@
sub MY::post_initialize {
my $self = shift;
+
+ # install libmodperl.so, MODPERL_LIB is not known here yet
+ if (exists $build->{MP_USE_DSO} && $build->{MP_USE_DSO}) {
+ my $MODPERL_LIB = join '.', $build->{MP_LIBNAME}, $Config{dlext};
+ $self->{PM}->{"src/modules/perl/$MODPERL_LIB"} =
+ "\$(APACHE_LIBDIR)/$MODPERL_LIB";
+ }
+
#up one from the Apache2/ subdir
#so it can be found for 'use Apache2 ()'
$self->{PM}->{'lib/Apache2.pm'} = "blib/lib/Apache2.pm";