fix for lib- package rename

git-svn-id: svn://tug.org/texlive/trunk@5941 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 6 insertions, 9 deletions

diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 3562bf6b572..97e0b80711b 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -346,6 +346,12 @@ sub calc_depends {
           foreach my $a (@archs) {
             $install{"$foo.$a"} = 1;
           }
+        } elsif ($p_dep =~ m/^(.*)\.win32$/) {
+          # a win32 package should *only* be installed if we are installing
+          # the win32 arch
+          if (grep(/^win32$/,@archs)) {
+            $install{$p_dep} = 1;
+          }
         } else {
           $install{$p_dep} = 1;
         }
@@ -362,15 +368,6 @@ sub calc_depends {
     }
   }
 
-  # install source packages, they don't contain *any* dependencies
-  if ($vars{'option_src'}) {
-    foreach my $p (keys %install) {
-      my $tlpobj = $tlpdb->get_package("$p.SOURCES");
-      if (defined($tlpobj)) {
-        $install{"$p.SOURCES"} = 1;
-      }
-    }
-  }
   # now do the size computation
   my $size = 0;
   foreach my $p (keys %install) {