Change 11461 by jhi@alpha on 2001/07/23 22:58:15
Subject: [PATCH 5.7.2] MakeMaker FIRST_MAKEFILE and subdir
From: Ilya Zakharevich <[EMAIL PROTECTED]>
Date: Mon, 23 Jul 2001 18:43:42 -0400
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/perl/lib/ExtUtils/MM_Unix.pm#111 edit
... //depot/perl/lib/ExtUtils/MakeMaker.pm#65 edit
Differences ...
==== //depot/perl/lib/ExtUtils/MM_Unix.pm#111 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm.~1~ Mon Jul 23 17:00:06 2001
+++ perl/lib/ExtUtils/MM_Unix.pm Mon Jul 23 17:00:06 2001
@@ -3367,7 +3367,7 @@
subdirs ::
@[
cd $subdir
- \$(MAKE) all \$(PASTHRU)
+ \$(MAKE) -f \$(FIRST_MAKEFILE) all \$(PASTHRU)
cd ..
]
EOT
@@ -3376,7 +3376,7 @@
return <<EOT;
subdirs ::
cd $subdir
- \$(MAKE) all \$(PASTHRU)
+ \$(MAKE) -f \$(FIRST_MAKEFILE) all \$(PASTHRU)
cd ..
EOT
}
@@ -3384,8 +3384,7 @@
return <<EOT;
subdirs ::
- $self->{NOECHO}cd $subdir && \$(MAKE) all \$(PASTHRU)
-
+ $self->{NOECHO}cd $subdir && \$(MAKE) -f \$(FIRST_MAKEFILE) all \$(PASTHRU)
EOT
}
}
==== //depot/perl/lib/ExtUtils/MakeMaker.pm#65 (text) ====
Index: perl/lib/ExtUtils/MakeMaker.pm
--- perl/lib/ExtUtils/MakeMaker.pm.~1~ Mon Jul 23 17:00:06 2001
+++ perl/lib/ExtUtils/MakeMaker.pm Mon Jul 23 17:00:06 2001
@@ -423,6 +423,8 @@
}
}
}
+ my @fm = grep /^FIRST_MAKEFILE=/, @ARGV;
+ parse_args($self,@fm) if @fm;
} else {
parse_args($self,split(' ', $ENV{PERL_MM_OPT} || ''),@ARGV);
}
End of Patch.
