randyk 2004/06/23 20:41:11
Modified: win32 Configure.pl
Log:
Submitted by: Markus Wichitill <[EMAIL PROTECTED]>
Reviewed by: randyk
use $ENV{ProgramFiles}, rather than hard-coded 'Program Files', in
Configure.pl when looking for the Apache binary, so as to be more
useful on non-English Win32.
Revision Changes Path
1.31 +3 -2 httpd-apreq-2/win32/Configure.pl
Index: Configure.pl
===================================================================
RCS file: /home/cvs/httpd-apreq-2/win32/Configure.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Configure.pl 11 Jun 2004 02:36:30 -0000 1.30
+++ Configure.pl 24 Jun 2004 03:41:11 -0000 1.31
@@ -266,10 +266,11 @@
return unless $program;
my @extras = ();
my @drives = drives();
+ (my $program_files = $ENV{ProgramFiles}) =~ s!^\w+:\\!!;
if (@drives > 0) {
for my $drive (@drives) {
- for ('Apache2', 'Program Files/Apache2',
- 'Program Files/Apache Group/Apache2') {
+ for ('Apache2', "$program_files/Apache2",
+ "$program_files/Apache Group/Apache2") {
my $bin = catdir $drive, $_, 'bin';
push @extras, $bin if (-d $bin);
}
