dougm 02/01/23 13:57:10
Modified: perl-framework/Apache-Test/lib/Apache TestConfig.pm
Log:
determine proper httpd_basedir when given a 1.3.x win32 layout
Revision Changes Path
1.123 +6 -2
httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
Index: TestConfig.pm
===================================================================
RCS file:
/home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- TestConfig.pm 21 Jan 2002 02:11:12 -0000 1.122
+++ TestConfig.pm 23 Jan 2002 21:57:10 -0000 1.123
@@ -293,8 +293,12 @@
if ($vars->{httpd}) {
my @chunks = splitdir $vars->{httpd};
- pop @chunks for 1..2; #bin/httpd
- $self->{httpd_basedir} = catfile @chunks;
+ #handle both $prefix/bin/httpd and $prefix/Apache.exe
+ for (1,2) {
+ pop @chunks;
+ $self->{httpd_basedir} = catfile @chunks;
+ last if -d "$self->{httpd_basedir}/bin";
+ }
}
#cleanup httpd droppings
