Break out the test for #27839 into a new test file.

[perl5.git] / installman

diff --git a/installman b/installman
index 9c3f873..7665047 100755 (executable)
--- a/installman
+++ b/installman
@@ -1,7 +1,7 @@
 #!./perl -w
 BEGIN {
     @INC = qw(lib);
-    
+
     # This needs to be at BEGIN time, before any use of Config
     require './install_lib.pl';
 }
@@ -18,8 +18,6 @@ use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare
 
 $ENV{SHELL} = 'sh' if $^O eq 'os2';
 
-my $ver = $Config{version};     # Not used presently.
-my $release = substr($],0,3);   # Not used presently.
 my $patchlevel = substr($],3,2);
 die "Patchlevel of perl ($patchlevel)",
     "and patchlevel of config.sh ($Config{'PERL_VERSION'}) don't match\n"
@@ -41,26 +39,22 @@ my $usage =
 
 GetOptions( \%opts,
             qw( man1dir=s man1ext=s man3dir=s man3ext=s batchlimit=i
-                destdir:s notify n help silent S verbose V)) 
+                destdir:s notify n help silent S verbose V))
        || die $usage;
 die $usage if $opts{help};
 $opts{destdir} //= '';
 
-$opts{man1dir} = "$opts{destdir}$Config{'installman1dir'}"
-    unless defined($opts{man1dir}); 
-$opts{man1ext} = $Config{'man1ext'}
-    unless defined($opts{man1ext}); 
-$opts{man3dir} = "$opts{destdir}$Config{'installman3dir'}"
-    unless defined($opts{man3dir}); 
-$opts{man3ext} = $Config{'man3ext'}
-    unless defined($opts{man3ext}); 
+foreach my $pre (qw(man1 man3)) {
+    $opts{"${pre}dir"} //= $opts{destdir} . $Config{"install${pre}dir"};
+    $opts{"${pre}ext"} //= $Config{"${pre}ext"};
+}
 $opts{silent} ||= $opts{S};
 $opts{notify} ||= $opts{n};
 $opts{verbose} ||= $opts{V} || $opts{notify};
 
 #Sanity checks
 
--x  "./perl$Config{exe_ext}" 
+-x  "./perl$Config{exe_ext}"
   or warn "./perl$Config{exe_ext} not found!  Have you run make?\n";
 -d  "$opts{destdir}$Config{'installprivlib'}"
        || warn "Perl library directory $Config{'installprivlib'} not found.
@@ -70,6 +64,11 @@ $opts{verbose} ||= $opts{V} || $opts{notify};
 
 $packlist = ExtUtils::Packlist->new("$opts{destdir}$Config{installarchlib}/.packlist");
 
+# manpages not to be installed
+my %do_not_install = map { ($_ => 1) } qw(
+    Pod/Functions.pm
+    XS/APItest.pm
+);
 
 # Install the main pod pages.
 pod2man('pod', $opts{man1dir}, $opts{man1ext});
@@ -102,7 +101,7 @@ while (<UTILS>) {
 }
 
 sub pod2man {
-    # @script is scripts names if we are installing manpages embedded 
+    # @script is scripts names if we are installing manpages embedded
     # in scripts, () otherwise
     my($poddir, $mandir, $manext, @script) = @_;
     if ($mandir eq ' ' or $mandir eq '') {
@@ -145,8 +144,8 @@ sub pod2man {
        my $tmp;
        # Skip .pm files that have corresponding .pod files, and Functions.pm.
        next if (($tmp = $mod) =~ s/\.pm$/.pod/ && -f $tmp);
-       next if $mod =~ m:/t/:; # no pods from test directories 
-       next if ($manpage eq 'Pod/Functions.pm'); #### Used only by pod itself
+       next if $mod =~ m:/t/:; # no pods from test directories
+       next if $do_not_install{$manpage};
 
        # Skip files without pod docs
        my $has_pod;
@@ -215,7 +214,7 @@ sub rename {
        for ($i = 1; $i < 50; $i++) {
            last if CORE::rename($to, "$to.$i");
        }
-       warn("Cannot rename to `$to.$i': $!"), return 0 
+       warn("Cannot rename to `$to.$i': $!"), return 0
            if $i >= 50;        # Give up!
     }
     link($from,$to) || return 0;