svn commit: r126052 - /perl/modperl/trunk/Changes /perl/modperl/trunk/lib/Apache/Build.pm

[stas]

Author: stas
Date: Sat Jan 22 12:59:26 2005
New Revision: 126052

URL: http://svn.apache.org/viewcvs?view=rev&rev=126052
Log:
fix a bug in Apache::Build::dir: If the right directory isn't found in
the for loop $dir still contains a > value, so the ||= has no
effect. [Nick Wellnhofer <[EMAIL PROTECTED]>]

Modified:
   perl/modperl/trunk/Changes
   perl/modperl/trunk/lib/Apache/Build.pm

Modified: perl/modperl/trunk/Changes
Url: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&rev=126052&p1=perl/modperl/trunk/Changes&r1=126051&p2=perl/modperl/trunk/Changes&r2=126052
==============================================================================
--- perl/modperl/trunk/Changes  (original)
+++ perl/modperl/trunk/Changes  Sat Jan 22 12:59:26 2005
@@ -12,6 +12,12 @@
 
 =item 1.999_22
 
+fix a bug in Apache::Build::dir: If the right directory isn't found in
+the for loop $dir still contains a > value, so the ||= has no
+effect. [Nick Wellnhofer <[EMAIL PROTECTED]>]
+
+
+
 =item 1.999_21 - January 22, 2005
 
 PerlPostConfigRequire was trying to detect missing files early on,

Modified: perl/modperl/trunk/lib/Apache/Build.pm
Url: 
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache/Build.pm?view=diff&rev=126052&p1=perl/modperl/trunk/lib/Apache/Build.pm&r1=126051&p2=perl/modperl/trunk/lib/Apache/Build.pm&r2=126052
==============================================================================
--- perl/modperl/trunk/lib/Apache/Build.pm      (original)
+++ perl/modperl/trunk/lib/Apache/Build.pm      Sat Jan 22 12:59:26 2005
@@ -907,9 +907,12 @@
     if (IS_MOD_PERL_BUILD) {
         my $build = $self->build_config;
 
-        if ($dir = $build->{'dir'}) {
-            for ($dir, "../$dir", "../../$dir") {
-                last if -d ($dir = $_);
+        if (my $bdir = $build->{'dir'}) {
+            for ($bdir, "../$bdir", "../../$bdir") {
+                if (-d $_) {
+                    $dir = $_;
+                    last;
+                }
             }
         }
     }