DESTDIR in perl-5.8.1 package?

Date: Fri, 11 Jul 2003 14:48:41 +0200
Message-ID: <20030711124841.GA18327@immd4.informatik.uni-erlangen.de>

Subject: Re: DESTDIR in perl-5.8.1 package?
From: Michael Schroeder <Michael.Schroeder@informatik.uni-erlangen.de>
Date: Mon, 14 Jul 2003 12:00:25 +0200
Message-ID: <20030714100025.GA26612@immd4.informatik.uni-erlangen.de>

(blindly prepending and s///ing away the $destdir does not work
 at least in VMS, but the --destdir should help rpm builders
 and the like)

p4raw-id: //depot/perl@20302

1 files changed, 9 insertions, 7 deletions

diff --git a/installman b/installman
index 2260c26d42..1a5062dd37 100755
--- a/installman
+++ b/installman
@@ -41,15 +41,15 @@ my $usage =
 my %opts;
 GetOptions( \%opts,
             qw( man1dir=s man1ext=s man3dir=s man3ext=s batchlimit=i
-                notify n help silent S verbose V)) 
+                destdir=s notify n help silent S verbose V)) 
 	|| die $usage;
 die $usage if $opts{help};
 
-$opts{man1dir} = $Config{'installman1dir'}
+$opts{man1dir} = "$opts{destdir}$Config{'installman1dir'}"
     unless defined($opts{man1dir}); 
 $opts{man1ext} = $Config{'man1ext'}
     unless defined($opts{man1ext}); 
-$opts{man3dir} = $Config{'installman3dir'}
+$opts{man3dir} = "$opts{destdir}$Config{'installman3dir'}"
     unless defined($opts{man3dir}); 
 $opts{man3ext} = $Config{'man3ext'}
     unless defined($opts{man3ext}); 
@@ -61,13 +61,13 @@ $opts{verbose} ||= $opts{V} || $opts{notify};
 
 -x  "./perl$Config{exe_ext}" 
   or warn "./perl$Config{exe_ext} not found!  Have you run make?\n";
--d  $Config{'installprivlib'}
+-d  "$opts{destdir}$Config{'installprivlib'}"
 	|| warn "Perl library directory $Config{'installprivlib'} not found.
 		Have you run make install?.  (Installing anyway.)\n";
 -x "t/perl$Config{exe_ext}"		|| warn "WARNING: You've never run 'make test'!!!",
 	"  (Installing anyway.)\n";
 
-$packlist = ExtUtils::Packlist->new("$Config{installarchlib}/.packlist");
+$packlist = ExtUtils::Packlist->new("$opts{destdir}/$Config{installarchlib}/.packlist");
 
 
 # Install the main pod pages.
@@ -163,11 +163,13 @@ sub pod2man {
     foreach my $page (@to_process) {
 	my($pod, $tmp, $manpage) = @$page;
 
-        print "  $manpage\n";
+	my $xmanpage = $manpage;
+	$xmanpage =~ s/^\Q$opts{'destdir'}\E// if $opts{'destdir'};
+        print "  $xmanpage\n";
 	if (!$opts{notify} && $parser->parse_from_file($pod, $tmp)) {
             if (-s $tmp) {
                 if (rename($tmp, $manpage)) {
-                    $packlist->{$manpage} = { type => 'file' };
+                    $packlist->{$xmanpage} = { type => 'file' };
                     next;
                 }
             }