stas 2003/08/13 15:38:05
Modified: lib/Apache Build.pm
Log:
look in the source tree for mpm_name if MP_AP_PREFIX is passed
Revision Changes Path
1.138 +3 -3 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- Build.pm 12 Aug 2003 23:13:20 -0000 1.137
+++ Build.pm 13 Aug 2003 22:38:04 -0000 1.138
@@ -169,9 +169,9 @@
my $mpm_name = $self->apxs('-q' => 'MPM_NAME');
# building against the httpd source dir
- unless ($mpm_name and exists $self->{dir}) {
- my $config_vars_file = catfile $self->{dir},
- "build", "config_vars.mk";
+ unless ($mpm_name and $self->httpd_is_source_tree) {
+ my $prefix = $self->{MP_AP_PREFIX} || $self->{dir};
+ my $config_vars_file = catfile $prefix, "build", "config_vars.mk";
if (open my $fh, $config_vars_file) {
while (<$fh>) {
if (/MPM_NAME = (\w+)/) {
