X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installman;h=8f6bd80d2aadbc3a3d75e955563af1aa0d4ae258;hb=e25a7dc23f32d0dd4f1c4c8645877a39bdb9d4b7;hp=1a5062dd37e33ea7c356474d950a2098c3dba5cd;hpb=5a9231b0b3e59b5d3123feacc331e9990c48e062;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installman b/installman
index 1a5062d..8f6bd80 100755
--- a/installman
+++ b/installman
@@ -1,6 +1,32 @@
 #!./perl -w
 BEGIN { @INC = qw(lib) }
 use strict;
+
+BEGIN {
+    use Config;
+    if ($Config{userelocatableinc}) {
+	# This might be a considered a hack. Need to get information about the
+	# configuration from Config.pm *before* Config.pm expands any .../
+	# prefixes.
+	#
+	# So we set $^X to pretend that we're the already installed perl, so
+	# Config.pm doesits ... expansion off that location.
+
+	my $location = $Config{initialinstalllocation};
+	die <<'OS' unless defined $location;
+$Config{initialinstalllocation} is not defined - can't install a relocatable
+perl without this.
+OS
+	$^X = "$location/perl";
+	# And then remove all trace of ever having loaded Config.pm, so that
+	# it will reload with the revised $^X
+	undef %Config::;
+	delete $INC{"Config.pm"};
+	delete $INC{"Config_heavy.pl"};
+	# You never saw us. We weren't here.
+    }
+}
+
 use Config;
 use Getopt::Long;
 use File::Find;
@@ -41,9 +67,10 @@ my $usage =
 my %opts;
 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}); 
@@ -67,7 +94,7 @@ $opts{verbose} ||= $opts{V} || $opts{notify};
 -x "t/perl$Config{exe_ext}"		|| warn "WARNING: You've never run 'make test'!!!",
 	"  (Installing anyway.)\n";
 
-$packlist = ExtUtils::Packlist->new("$opts{destdir}/$Config{installarchlib}/.packlist");
+$packlist = ExtUtils::Packlist->new("$opts{destdir}$Config{installarchlib}/.packlist");
 
 
 # Install the main pod pages.
@@ -91,6 +118,11 @@ while (<UTILS>) {
 	    my $new = "$opts{man1dir}/$what2.$opts{man1ext}";
 	    unlink($new);
 	    link($old, $new);
+	    my $xold = $old;
+	    $xold =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
+	    my $xnew = $new;
+	    $xnew =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
+	    $packlist->{$xnew} = { from => $xold, type => 'link' };
 	}
     }
 }
@@ -142,6 +174,25 @@ sub pod2man {
 	next if $mod =~ m:/t/:; # no pods from test directories 
 	next if ($manpage eq 'Pod/Functions.pm'); #### Used only by pod itself
 
+	# Skip files without pod docs
+	my $has_pod;
+	if (open T, $mod)
+	{
+	    local $_;
+	    while (<T>)
+	    {
+		++$has_pod and last if /^=(?:head\d+|item|pod)\b/;
+	    }
+
+	    close T;
+	}
+
+	unless ($has_pod)
+	{
+	    warn "no documentation in $mod\n";
+	    next;
+	}
+
 	# Convert name from  File/Basename.pm to File::Basename.3 format,
 	# if necessary.
 	$manpage =~ s#\.p(m|od)$##;
@@ -156,13 +207,13 @@ sub pod2man {
 	push @to_process, [$mod, $tmp, $manpage];
     }
 
-    my $parser = Pod::Man->new( section => $manext,
-                                official=> 1,
-                                center  => 'Perl Programmers Reference Guide'
-                              );
     foreach my $page (@to_process) {
 	my($pod, $tmp, $manpage) = @$page;
 
+        my $parser = Pod::Man->new( section => $manext,
+                                    official=> 1,
+                                    center  => 'Perl Programmers Reference Guide'
+                                  );
 	my $xmanpage = $manpage;
 	$xmanpage =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
         print "  $xmanpage\n";
@@ -182,7 +233,6 @@ $packlist->write() unless $opts{notify};
 print "  Installation complete\n" if $opts{verbose};
 
 exit 0;
-    
 
 ###############################################################################
 # Utility subroutines from installperl