Rafael Garcia-Suarez <[EMAIL PROTECTED]> writes:

> Change 27592 by [EMAIL PROTECTED] on 2006/03/23 22:13:13
> 
>       When MAN3PODS is forced to {} in a Makefile.PL, manpages should not be
>       built from pods. This change fixes bleadperl compilation -- trying to
>       build manpages with miniperl causes a bootstrapping problem.

This change seems to disable building of manpages for extensions
installed later too.  The call to init_MAN3PODS should not be disabled
when not INSTALLMAN3DIR is present in the first place.  I suggest the
following simplification:

==== //depot/perl/lib/ExtUtils/MM_Unix.pm#211 - 
/home/gisle/perl/blead/lib/ExtUtils/MM_Unix.pm ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm.~1~    Thu Mar 30 18:59:38 2006
+++ perl/lib/ExtUtils/MM_Unix.pm        Thu Mar 30 18:59:38 2006
@@ -1305,19 +1305,14 @@
 
     # Set up names of manual pages to generate from pods
     foreach my $man (qw(MAN1 MAN3)) {
-       $self->{"BUILD${man}PODS"} = 1;
-
        unless ($self->{"${man}PODS"}) {
            $self->{"${man}PODS"} = {};
-           $self->{"BUILD${man}PODS"} = 0 if
-              $self->{"INSTALL${man}DIR"} =~ /^(none|\s*)$/;
+           unless ($self->{"INSTALL${man}DIR"} =~ /^(none|\s*)$/) {
+               my $init = "init_${man}PODS";
+               $self->$init();
+           }
        }
-       $self->{"BUILD${man}PODS"} = 0 if
-           scalar(keys %{$self->{"${man}PODS"}}) == 0;
     }
-
-    $self->init_MAN1PODS() if $self->{BUILDMAN1PODS};
-    $self->init_MAN3PODS() if $self->{BUILDMAN3PODS};
 }
 
 
End of Patch.



> 
> Affected files ...
> 
> ... //depot/perl/lib/ExtUtils/MM_Unix.pm#211 edit
> 
> Differences ...
> 
> ==== //depot/perl/lib/ExtUtils/MM_Unix.pm#211 (text) ====
> Index: perl/lib/ExtUtils/MM_Unix.pm
> --- perl/lib/ExtUtils/MM_Unix.pm#210~27590~   2006-03-23 09:43:26.000000000 
> -0800
> +++ perl/lib/ExtUtils/MM_Unix.pm      2006-03-23 14:13:13.000000000 -0800
> @@ -19,7 +19,7 @@
>  use ExtUtils::MakeMaker qw($Verbose neatvalue);
>  
>  # $VERSION needs to stay numeric to avoid test warnings
> -$VERSION = '1.5002';
> +$VERSION = '1.5003';
>  
>  require ExtUtils::MM_Any;
>  @ISA = qw(ExtUtils::MM_Any);
> @@ -1312,6 +1312,8 @@
>           $self->{"BUILD${man}PODS"} = 0 if
>                $self->{"INSTALL${man}DIR"} =~ /^(none|\s*)$/;
>       }
> +     $self->{"BUILD${man}PODS"} = 0 if
> +         scalar(keys %{$self->{"${man}PODS"}}) == 0;
>      }
>  
>      $self->init_MAN1PODS() if $self->{BUILDMAN1PODS};
> End of Patch.

Reply via email to