install-tl:

- added call to broadcast_env
- set PERL5LIB outright at postinstall (old code commented out but
  not removed)
- removed some slash flipping; TLWinGoo handles forward slashes.



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

1 files changed, 10 insertions, 8 deletions

diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 5100203d9d2..6d78e2d4f6b 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -758,12 +758,13 @@ sub do_postinst_stuff {
   if (win32()) {
     # we are working with our version of perl
     # thus, we have to set the PERLLIB envvar right
-    my $perllib = "";
-    if (defined($ENV{'PERL5LIB'})) {
-      $perllib = $ENV{'PERL5LIB'};
-    }
-    $perllib .= ";$vars{'TEXDIR'}/tlpkg/tlperl/lib";
-    $ENV{'PERL5LIB'} = $perllib;
+    #my $perllib = "";
+    #if (defined($ENV{'PERL5LIB'})) {
+    #  $perllib = $ENV{'PERL5LIB'};
+    #}
+    #$perllib .= ";$vars{'TEXDIR'}/tlpkg/tlperl/lib";
+    #$ENV{'PERL5LIB'} = $perllib;
+    $ENV{'PERL5LIB'} = "$vars{'TEXDIR'}/tlpkg/tlperl/lib";
   }
   #
   # Step 4: run the programs
@@ -833,7 +834,7 @@ sub do_texmf_cnf {
         push @newtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
       }
     } elsif ($line =~ m/^TEXMFHOME/) {
-      # kpse now expands ~ to USERPROFILE, so we don't treat win32 and 
+      # kpse now expands ~ to USERPROFILE, so we don't treat win32 and
       # unix differently
       push @newtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n";
     } elsif ($line =~ m/^OSFONTDIR/) {
@@ -855,9 +856,10 @@ sub do_texmf_cnf {
 sub do_win_registry_magic {
   # we are called under if (win32()) !!
   my $winpath = "$vars{'TEXDIR'}/bin/win32";
-  $winpath =~ s!/!\\!g;
+  #$winpath =~ s!/!\\!g;
   add_texbindir_to_path($winpath);
   register_script_type(".texlua", $winpath."/texlua.exe");
+  broadcast_env;
 }
 
 #