summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/bin/win32/conf/fonts.conf1
-rwxr-xr-xMaster/install-tl4
-rw-r--r--Master/texmf/web2c/texmf.cnf16
-rw-r--r--Master/tlpkg/TeXLive/TLPostActions.pm1
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm6
5 files changed, 17 insertions, 11 deletions
diff --git a/Master/bin/win32/conf/fonts.conf b/Master/bin/win32/conf/fonts.conf
index da22ed635d0..55c69f64583 100644
--- a/Master/bin/win32/conf/fonts.conf
+++ b/Master/bin/win32/conf/fonts.conf
@@ -23,7 +23,6 @@
<cachedir>c:/etc/fccache</cachedir>
You don't need to set this section.
-->
-<cachedir>c:/etc/fccache</cachedir>
<!--
diff --git a/Master/install-tl b/Master/install-tl
index 5d7c66ff696..4e03dc73f47 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -381,6 +381,10 @@ if ($opt_profile eq "") {
if (!$finished) {
# do the actual installation
+ # win32: first, remove trailing slash from texdir[w]
+ # in case it is the root of a drive
+ $vars{'TEXDIR'} =~ s![/\\]$!!;
+ $vars{'TEXDIRW'} =~ s![/\\]$!!;
do_installation();
}
diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index 0c0c49efee7..2f0719d4b7a 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -119,7 +119,7 @@ VARTEXFONTS = $TEXMFVAR/fonts
% does not create ls-R files in the non-!! elements -- because if an
% ls-R is present, it will be used, and the disk will not be searched.
% This is arguably a bug in kpathsea, but we will not think about it now.
-%
+%
TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
% It may be convenient to define TEXMF like this:
@@ -168,6 +168,7 @@ TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}//
TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}//
TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
+TEXINPUTS.xetex = .;$TEXMF/tex/{plain,generic,}//
% LaTeX 2e specific macros are stored in latex/, macros that can only be
% used with 2.09 in latex209/. In addition, we look in the directory
@@ -177,6 +178,7 @@ TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
+TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,generic,}//
% Fontinst needs to read afm files.
TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
@@ -366,8 +368,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
MIMELIBDIR = $SELFAUTOPARENT/etc
MAILCAPLIBDIR = $SELFAUTOPARENT/etc
-% Default settings for fontconfig library, used by Win32 versions of
-% xetex/xdvipdfmx (note that fontconfig on Linux/Unix-like systems
+% Default settings for fontconfig library, used by Win32 versions of
+% xetex/xdvipdfmx (note that fontconfig on Linux/Unix-like systems
% will ignore settings in this file)
FONTCONFIG_FILE=fonts.conf
FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
@@ -425,7 +427,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
% paradoxical), but the compile-time default in paths.h is built from it.
% The SELFAUTO* variables are set automatically from the location of
% argv[0], in kpse_set_progname.
-%
+%
% For security reasons, it is better not to include . in this path.
%
TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
@@ -444,14 +446,14 @@ engine = unsetengine
% first. If this is false, we first look for a.b and then a.b.tex,
% first. If this is false, we first look for a.b and then a.b.tex,
% i.e., we try the name as-is first.
-%
+%
% Both names are always tried; the difference is the order in which they
% are tried. The setting applies to all searches, not just .tex.
-%
+%
% This setting only affects names being looked up which *already* have
% an extension. A name without an extension (e.g., `tex story') will
% always have an extension added first.
-%
+%
% The default is true, because we already avoid adding the standard
% extension(s) in most common cases. E.g., babel.sty will only look for
% babel.sty, not babel.sty.tex, regardless of this setting.
diff --git a/Master/tlpkg/TeXLive/TLPostActions.pm b/Master/tlpkg/TeXLive/TLPostActions.pm
index b9bb04de647..092b8864ad4 100644
--- a/Master/tlpkg/TeXLive/TLPostActions.pm
+++ b/Master/tlpkg/TeXLive/TLPostActions.pm
@@ -73,7 +73,6 @@ sub do_install_bin_xetex {
foreach (@lines) {
$_ =~ s!c:/Program Files/texlive/2008!$texdir!;
$_ =~ s!c:/windows/fonts!$winfontdir! if win32();
- $_ =~ s!c:/etc/fccache!$texmfsysvar/fonts/cache!;
print FONTSCONF;
}
close(FONTSCONF);
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index b868e75b2f7..209e516cde2 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -925,12 +925,12 @@ Reinitialize unshort.bat, the shortcuts uninstaller.
=cut
sub init_unshortbat {
- my $texdir = shift;
+ my $texdirw = shift;
my $menupath = menu_path();
$menupath =~ s!/!\\!g;
# batchfile for uninstalling shortcuts
- open UNSHORT, ">$texdir/tlpkg/installer/unshort.bat";
+ open UNSHORT, ">$texdirw/tlpkg/installer/unshort.bat";
print UNSHORT 'rmdir /s /q "'.$menupath."\\TeX Live 2008\" 2>nul\n";
close UNSHORT;
}
@@ -1013,6 +1013,8 @@ sub create_uninstaller {
open UNINST, ">$tdwfw/tlpkg/installer/uninst.bat";
print UNINST <<UNEND;
\@echo off
+rem This should not be necessary, but sometimes it is:
+path $td\\bin\\win32;%path%
set PERL5LIB=
\"$td\\tlpkg\\tlperl\\bin\\perl.exe\" \"$td\\texmf\\scripts\\texlive\\uninstall-win32.pl\"
call \"$tdw\\tlpkg\\installer\\unshort.bat\"