Changeset 3223 for trunk/essentials/dev-lang

Timestamp:

Apr 29, 2007, 8:02:22 PM (19 years ago)

Author:

bird

Message:

installation hacks.

Location:

trunk/essentials/dev-lang/perl

Files:

• Makefile.kmk (modified) (3 diffs)
• installman (modified) (2 diffs)
• installperl (modified) (2 diffs)

trunk/essentials/dev-lang/perl/Makefile.kmk

@@ -5 +5 @@
 GMAKE ?= $(PATH_KBUILD_BIN)/kmk_gmake$(HOSTSUFF_EXE)
 
-                                
+
 EXTRAS :=
 ifndef NOT_BOOTSTRAPPING_KNIX
@@ -19 +19 @@
 endif
 
+
+
+
+
+
+
 config:
         $(RM) -f config.sh Policy.sh
@@ -36 +42 @@
                 -Dcf_by='kNIX'
                 
+
+
 build:
         +$(GMAKE) MAKE=$(GMAKE)
 
+
+
 check test:
         +$(GMAKE) MAKE=$(GMAKE) test
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/essentials/dev-lang/perl/installman

@@ -46 +46 @@
 die $usage if $opts{help};
 
-$opts{man1dir} = "$opts{destdir}$Config{'installman1dir'}"
+my %MyConfig;
+$MyConfig{'installbin'}      = $Config{'installbin'};
+$MyConfig{'installscript'}   = $Config{'installscript'};
+$MyConfig{'installarchlib'}  = $Config{'installarchlib'};
+$MyConfig{'installsitelib'}  = $Config{'installsitelib'};
+$MyConfig{'installsitearch'} = $Config{'installsitearch'};
+$MyConfig{'installprivlib'}  = $Config{'installprivlib'};
+$MyConfig{'installman1dir'}  = $Config{'installman1dir'};
+$MyConfig{'installman3dir'}  = $Config{'installman3dir'};
+if ($^O eq 'os2' && "$opts{destdir}" ne '') {
+    # Drop the /@unixroot bit if not installing to the unixroot.
+    my $unixroot = '/@unixroot';
+    $MyConfig{'installbin'}      =~ s/^$unixroot//;
+    $MyConfig{'installscript'}   =~ s/^$unixroot//;
+    $MyConfig{'installarchlib'}  =~ s/^$unixroot//;
+    $MyConfig{'installsitelib'}  =~ s/^$unixroot//;
+    $MyConfig{'installsitearch'} =~ s/^$unixroot//;
+    $MyConfig{'installprivlib'}  =~ s/^$unixroot//;
+    $MyConfig{'installman1dir'}  =~ s/^$unixroot//;
+    $MyConfig{'installman3dir'}  =~ s/^$unixroot//;
+    #$Config{'archlibexp'}      =~ s/^$unixroot//;
+    #$Config{'privlibexp'}      =~ s/^$unixroot//;
+    #$Config{'scriptdir'}       =~ s/^$unixroot//;
+    #$Config{'sitearchexp'}     =~ s/^$unixroot//;
+    #$Config{'sitelibexp'}      =~ s/^$unixroot//;
+}
+
+$opts{man1dir} = "$opts{destdir}$MyConfig{'installman1dir'}"
     unless defined($opts{man1dir}); 
 $opts{man1ext} = $Config{'man1ext'}
     unless defined($opts{man1ext}); 
-$opts{man3dir} = "$opts{destdir}$Config{'installman3dir'}"
+$opts{man3dir} = "$opts{destdir}$Config{'installman3dir'}"
     unless defined($opts{man3dir}); 
 $opts{man3ext} = $Config{'man3ext'}
@@ -62 +89 @@
 -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.
+-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("$opts{destdir}$Config{installarchlib}/.packlist");
+$packlist = ExtUtils::Packlist->new("$opts{destdir}$Config{installarchlib}/.packlist");
 
 

trunk/essentials/dev-lang/perl/installperl

@@ -183 +183 @@
         if $patchlevel != $Config{'PERL_VERSION'};
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 # Fetch some frequently-used items from %Config
-my $installbin = "$destdir$Config{installbin}";
-my $installscript = "$destdir$Config{installscript}";
-my $installprivlib = "$destdir$Config{installprivlib}";
-my $installarchlib = "$destdir$Config{installarchlib}";
-my $installsitelib = "$destdir$Config{installsitelib}";
-my $installsitearch = "$destdir$Config{installsitearch}";
-my $installman1dir = "$destdir$Config{installman1dir}";
+my $installbin = "$destdir$Config{installbin}";
+my $installscript = "$destdir$Config{installscript}";
+my $installprivlib = "$destdir$Config{installprivlib}";
+my $installarchlib = "$destdir$Config{installarchlib}";
+my $installsitelib = "$destdir$Config{installsitelib}";
+my $installsitearch = "$destdir$Config{installsitearch}";
+my $installman1dir = "$destdir$Config{installman1dir}";
 my $man1ext = $Config{man1ext};
 my $libperl = $Config{libperl};
@@ -309 +336 @@
     $packlist->{"$installbin/$perldll"} = { type => 'file' };
 } # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 # First we install the version-numbered executables.