You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2004/12/06 22:34:13 UTC
svn commit: r110035 - /perl/modperl/trunk/lib/Apache/Build.pm
Author: stas
Date: Mon Dec 6 13:34:12 2004
New Revision: 110035
URL: http://svn.apache.org/viewcvs?view=rev&rev=110035
Log:
cleanup
Modified:
perl/modperl/trunk/lib/Apache/Build.pm
Modified: perl/modperl/trunk/lib/Apache/Build.pm
Url: http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache/Build.pm?view=diff&rev=110035&p1=perl/modperl/trunk/lib/Apache/Build.pm&r1=110034&p2=perl/modperl/trunk/lib/Apache/Build.pm&r2=110035
==============================================================================
--- perl/modperl/trunk/lib/Apache/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache/Build.pm Mon Dec 6 13:34:12 2004
@@ -239,7 +239,7 @@
$msg .= " Please specify MP_APXS=/full/path/to/apxs to solve " .
"this problem." unless exists $self->{MP_APXS};
error $msg;
- exit 1;
+ die "\n";
}
return $self->{mpm_name} = $mpm_name;
@@ -270,7 +270,7 @@
my $httpd = File::Spec->catfile($self->{MP_AP_PREFIX}, 'httpd');
$self->{'httpd'} ||= $httpd;
push @Apache::TestMM::Argv, ('httpd' => $self->{'httpd'});
-
+
my $mplib = "$self->{MP_LIBNAME}$Config{lib_ext}";
my $mplibpath = catfile($self->{cwd}, qw(src modules perl), $mplib);
@@ -283,14 +283,14 @@
split /\s+/, $ENV{CFLAGS} || '';
my $cd = qq(cd $self->{MP_AP_PREFIX});
-
+
#We need to clean the httpd tree before configuring it
if (-f File::Spec->catfile($self->{MP_AP_PREFIX}, 'Makefile')) {
my $cmd = qq(make clean);
debug "Running $cmd";
system("$cd && $cmd") == 0 or die "httpd: $cmd failed";
}
-
+
my $cmd = qq(./configure $self->{MP_AP_CONFIGURE});
debug "Running $cmd";
system("$cd && $cmd") == 0 or die "httpd: $cmd failed";