From: Ilya Zakharevich <ilya@math.berkeley.edu>
Date: Mon, 23 Jul 2001 18:43:42 +0000 (-0400)
Subject: MakeMaker FIRST_MAKEFILE and subdir
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2f217c7c33e3b14680f2e1a724b8a463a35767ea;p=p5sagit%2Fp5-mst-13.2.git

MakeMaker FIRST_MAKEFILE and subdir
Message-ID: <20010723184342.A14494@math.ohio-state.edu>

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

diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index da6a032..c951e52 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -3367,7 +3367,7 @@ sub subdir_x {
 subdirs ::
 @[
 	cd $subdir
-	\$(MAKE) all \$(PASTHRU)
+	\$(MAKE) -f \$(FIRST_MAKEFILE) all \$(PASTHRU)
 	cd ..
 ]
 EOT
@@ -3376,7 +3376,7 @@ EOT
 	    return <<EOT;
 subdirs ::
 	cd $subdir
-	\$(MAKE) all \$(PASTHRU)
+	\$(MAKE) -f \$(FIRST_MAKEFILE) all \$(PASTHRU)
 	cd ..
 EOT
 	}
@@ -3384,8 +3384,7 @@ EOT
 	return <<EOT;
 
 subdirs ::
-	$self->{NOECHO}cd $subdir && \$(MAKE) all \$(PASTHRU)
-
+	$self->{NOECHO}cd $subdir && \$(MAKE) -f \$(FIRST_MAKEFILE) all \$(PASTHRU)
 EOT
     }
 }
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 5a27fb4..b36a542 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -423,6 +423,8 @@ sub ExtUtils::MakeMaker::new {
 		    }
 	    }
 	}
+	my @fm = grep /^FIRST_MAKEFILE=/, @ARGV;
+	parse_args($self,@fm) if @fm;
     } else {
 	parse_args($self,split(' ', $ENV{PERL_MM_OPT} || ''),@ARGV);
     }