In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/a36b9036e25c58d568c35f764ff2830a9fc4b2f8?hp=d09f14bff00cc465825c16e4e810687132f34070>
- Log ----------------------------------------------------------------- commit a36b9036e25c58d568c35f764ff2830a9fc4b2f8 Author: H.Merijn Brand <[email protected]> Date: Mon Nov 13 09:03:40 2017 +0100 Do not (attempt to) install man pages when explicitly disabled Configure … -Dman1dir=none -Dman3dir=none … → installman1dir='' installman3dir='' ----------------------------------------------------------------------- Summary of changes: INSTALL | 4 ++++ installman | 48 ++++++++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/INSTALL b/INSTALL index 1285fc69a2..4f8f2e5801 100644 --- a/INSTALL +++ b/INSTALL @@ -790,6 +790,10 @@ want to use a .3pm suffix for perl man pages, you can do that with sh Configure -Dman3ext=3pm +You can disable installation of man pages completely using + + sh Configure -Dman1dir=none -Dman3dir=none + =item HTML pages Currently, the standard perl installation does not do anything with diff --git a/installman b/installman index 0bd435ffa4..b8c7757f37 100755 --- a/installman +++ b/installman @@ -54,6 +54,12 @@ foreach my $pre (qw(man1 man3)) { } $opts{verbose} ||= $opts{notify}; +# Explicitely disabled installation of man pages +if ($opts{man1dir} eq '' && $opts{man3dir} eq '') { + warn "Manual page installation was disabled by Configure\n"; + exit 0; +} + #Sanity checks -x "./perl$Config{exe_ext}" @@ -70,35 +76,37 @@ $packlist = ExtUtils::Packlist->new("$opts{destdir}$Config{installarchlib}/.pack pod2man(\%man1, $opts{man1dir}, $opts{man1ext}, 'pod'); # Install the pods for library modules. -{ +if ($opts{man3dir} ne '') { my $found = pods_to_install(); pod2man($found->{$_}, $opts{man3dir}, $opts{man3ext}, 'lib') foreach qw(MODULE PRAGMA); } # Install the pods embedded in the installed scripts -my $has_man1dir = $opts{man1dir} ne '' && -d $opts{man1dir}; -my $fh = open_or_die('utils.lst'); -while (<$fh>) { - next if /^#/; - chomp; - my ($path, $leaf) = m|^(\S*/(\S+))|; - # Have we already installed the manpage for this? (eg perldoc) - next if $man1{$leaf}; - pod2man({$leaf, $path}, $opts{man1dir}, $opts{man1ext}); - if ($has_man1dir) { - if (my ($link) = m|#.*link\s*=\s*\S+/(\S+)|) { - my $old = "$opts{man1dir}/$leaf.$opts{man1ext}"; - my $new = "$opts{man1dir}/$link.$opts{man1ext}"; - unlink($new); - link($old, $new); - $old =~ s/^\Q$opts{destdir}\E// if $opts{destdir}; - $new =~ s/^\Q$opts{destdir}\E// if $opts{destdir}; - $packlist->{$new} = { from => $old, type => 'link' }; +if ($opts{man1dir} ne '') { + my $has_man1dir = -d $opts{man1dir}; + my $fh = open_or_die('utils.lst'); + while (<$fh>) { + next if /^#/; + chomp; + my ($path, $leaf) = m|^(\S*/(\S+))|; + # Have we already installed the manpage for this? (eg perldoc) + next if $man1{$leaf}; + pod2man({$leaf, $path}, $opts{man1dir}, $opts{man1ext}); + if ($has_man1dir) { + if (my ($link) = m|#.*link\s*=\s*\S+/(\S+)|) { + my $old = "$opts{man1dir}/$leaf.$opts{man1ext}"; + my $new = "$opts{man1dir}/$link.$opts{man1ext}"; + unlink($new); + link($old, $new); + $old =~ s/^\Q$opts{destdir}\E// if $opts{destdir}; + $new =~ s/^\Q$opts{destdir}\E// if $opts{destdir}; + $packlist->{$new} = { from => $old, type => 'link' }; + } } } + close $fh or my_die("close 'utils.lst': $!"); } -close $fh or my_die("close 'utils.lst': $!"); sub pod2man { my($modpods, $mandir, $manext, $where) = @_; -- Perl5 Master Repository
