From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Thu, 31 Jul 2003 05:41:56 +0000 (+0000)
Subject: ext/SDBM_File/sdbm's auto directory ended up in ext/SDBM_File.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4644218255cda0e4e3e2d76588083cf8284a0cb2;p=p5sagit%2Fp5-mst-13.2.git

ext/SDBM_File/sdbm's auto directory ended up in ext/SDBM_File.
(Schwern)

p4raw-id: //depot/perl@20371
---

diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 8191303..640a074 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -439,9 +439,10 @@ sub new {
             next unless defined $self->{PARENT}{$key};
 
             # Don't stomp on WriteMakefile() args.
-            $self->{$key} = $self->{PARENT}{$key}
-                unless defined $self->{ARGS}{$key} and
-                       $self->{ARGS}{$key} eq $self->{$key};
+            next if defined $self->{ARGS}{$key} and
+                    $self->{ARGS}{$key} eq $self->{$key};
+
+            $self->{$key} = $self->{PARENT}{$key};
 
             unless ($Is_VMS && $key =~ /PERL$/) {
                 $self->{$key} = $self->catdir("..",$self->{$key})