diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-05-21 09:18:07 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-05-21 09:18:07 +0000 |
| commit | 4325052d2625a06294068527f0d65e6f637a59ee (patch) | |
| tree | dfb12d4ad8e6c5d1e259dd8f6df46f6fa7391308 /lib/ExtUtils/MM_Unix.pm | |
| parent | b15aece354b2aec9d338e59acb2abc2deeebc3c0 (diff) | |
| download | perl-4325052d2625a06294068527f0d65e6f637a59ee.tar.gz | |
Update to MakeMaker 6.30
p4raw-id: //depot/perl@24524
Diffstat (limited to 'lib/ExtUtils/MM_Unix.pm')
| -rw-r--r-- | lib/ExtUtils/MM_Unix.pm | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index d8f0564c9e..9d792a866e 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -20,7 +20,7 @@ use vars qw($VERSION @ISA use ExtUtils::MakeMaker qw($Verbose neatvalue); -$VERSION = '1.49'; +$VERSION = '1.50'; require ExtUtils::MM_Any; @ISA = qw(ExtUtils::MM_Any); @@ -3046,13 +3046,29 @@ sub processPL { $target = vmsify($target); } - $m .= sprintf <<'MAKE_FRAG', ($target) x 2, ($plfile) x 2, $target; + # Normally a .PL file runs AFTER pm_to_blib so it can have + # blib in its @INC and load the just built modules. BUT if + # the generated module is something in $(TO_INST_PM) which + # pm_to_blib depends on then it can't depend on pm_to_blib + # else we have a dependency loop. + my $pm_dep; + my $perlrun; + if( defined $self->{PM}{$target} ) { + $pm_dep = ''; + $perlrun = 'PERLRUN'; + } + else { + $pm_dep = 'pm_to_blib'; + $perlrun = 'PERLRUNINST'; + } -all :: %s - $(NOECHO) $(NOOP) + $m .= <<MAKE_FRAG; + +all :: $target + \$(NOECHO) \$(NOOP) -%s :: %s pm_to_blib - $(PERLRUNINST) %s %s +$target :: $plfile $pm_dep + \$($perlrun) $plfile $target MAKE_FRAG } |