This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
[perl #117033] wrong .packlist creation at installation on Cygwin with destdir
authorTony Cook <tony@develop-help.com>
Tue, 9 Jul 2013 00:37:32 +0000 (10:37 +1000)
committerTony Cook <tony@develop-help.com>
Tue, 9 Jul 2013 01:24:08 +0000 (11:24 +1000)
installperl

index ac1c770..60d392e 100755 (executable)
@@ -275,7 +275,7 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) {
     safe_unlink("$installbin/$perldll");
     copy("$perldll", "$installbin/$perldll");
     chmod(0755, "$installbin/$perldll");
     safe_unlink("$installbin/$perldll");
     copy("$perldll", "$installbin/$perldll");
     chmod(0755, "$installbin/$perldll");
-    $packlist->{"$installbin/$perldll"} = { type => 'file' };
+    $packlist->{"$Config{installbin}/$perldll"} = { type => 'file' };
 } # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin)
 
 # First we install the version-numbered executables.
 } # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin)
 
 # First we install the version-numbered executables.
@@ -357,21 +357,22 @@ if ($Is_VMS) {  # We did core file selection during build
 elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy
     @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
     my $coredll = "$installarchlib/CORE/$libperl";
 elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy
     @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
     my $coredll = "$installarchlib/CORE/$libperl";
+    my $instcoredll = "$Config{installarchlib}/CORE/$libperl";
     safe_unlink($coredll);
     ( $Config{'d_link'} eq 'define' &&
       eval {
           CORE::link("$installbin/$libperl", $coredll);
     safe_unlink($coredll);
     ( $Config{'d_link'} eq 'define' &&
       eval {
           CORE::link("$installbin/$libperl", $coredll);
-          $packlist->{$coredll} = { from => "$installbin/$libperl",
+          $packlist->{$instcoredll} = { from => "$Config{installbin}/$libperl",
                                     type => 'link' };
       }
     ) ||
     eval {
         symlink("$installbin/$libperl", $coredll);
                                     type => 'link' };
       }
     ) ||
     eval {
         symlink("$installbin/$libperl", $coredll);
-        $packlist->{$coredll} = { from => "$installbin/$libperl",
+        $packlist->{$instcoredll} = { from => "$Config{installbin}/$libperl",
                                   type => 'link' };
     } ||
     ( copy("$installbin/$libperl", $coredll) &&
                                   type => 'link' };
     } ||
     ( copy("$installbin/$libperl", $coredll) &&
-      push(@corefiles, $coredll)
+      push(@corefiles, $instcoredll)
     )
 } else {
     # [als] hard-coded 'libperl' name... not good!
     )
 } else {
     # [als] hard-coded 'libperl' name... not good!