diff options
author | Karl Berry <karl@freefriends.org> | 2008-10-25 13:21:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-10-25 13:21:45 +0000 |
commit | fea34ae4a52cd4cc3f7a82061c63165c9dc74dfe (patch) | |
tree | 00bc7c479fd3b0ba419ca64b0770c7c3f621022c /Master/tlpkg/TeXLive/TLPostActions.pm | |
parent | d6af9e469265a88c974dadfc86dac3bcdb6e3573 (diff) |
TLUtils.pm (conv_to_win_path): rename to conv_to_w32_path, since Windows
is not a win.
(setup_programs): painfully strip off quotes added by conv_to_w32_path
for the sake of the file test.
TLPostActions.pm: change calls.
TLMedia.pm: no need to import conv_to_win_path, it isn't used.
git-svn-id: svn://tug.org/texlive/trunk@11047 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/TeXLive/TLPostActions.pm')
-rw-r--r-- | Master/tlpkg/TeXLive/TLPostActions.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Master/tlpkg/TeXLive/TLPostActions.pm b/Master/tlpkg/TeXLive/TLPostActions.pm index a0c54aca93a..e91a468f457 100644 --- a/Master/tlpkg/TeXLive/TLPostActions.pm +++ b/Master/tlpkg/TeXLive/TLPostActions.pm @@ -17,7 +17,7 @@ BEGIN { @EXPORT = @EXPORT_OK; } -use TeXLive::TLUtils qw(win32 mkdirhier copy conv_to_win_path log debug info); +use TeXLive::TLUtils qw(win32 mkdirhier copy conv_to_w32_path log debug info); use TeXLive::TLWinGoo; my $mainmenu = "TeX Live 2008"; @@ -85,14 +85,14 @@ sub do_install_xetex { push @cpycmd, "cp", "-R"; } system(@cpycmd, - (win32() ? conv_to_win_path("$texdir/bin/win32/conf") : + (win32() ? conv_to_w32_path("$texdir/bin/win32/conf") : "$texdir/bin/win32/conf"), - (win32() ? conv_to_win_path("$texmfsysvar/fonts/conf") : + (win32() ? conv_to_w32_path("$texmfsysvar/fonts/conf") : "$texmfsysvar/fonts/conf")); system(@cpycmd, - (win32() ? conv_to_win_path("$texdir/bin/win32/cache") : + (win32() ? conv_to_w32_path("$texdir/bin/win32/cache") : "$texdir/bin/win32/cache"), - (win32() ? conv_to_win_path("$texmfsysvar/fonts/cache") : + (win32() ? conv_to_w32_path("$texmfsysvar/fonts/cache") : "$texmfsysvar/fonts/cache")); if (open(FONTSCONF, "<$texdir/bin/win32/conf/fonts.conf")) { my @lines = <FONTSCONF>; @@ -135,7 +135,7 @@ $PostInstall{"xetex"} = \&do_install_xetex; sub do_install_bin_dviout_win32 { my ($texdir, $texdirw) = @_; if (win32()) { - my $texdir_bsl = conv_to_win_path($texdir); + my $texdir_bsl = conv_to_w32_path($texdir); add_menu_shortcut( $mainmenu, 'DVIOUT Dvi Viewer', |