summaryrefslogtreecommitdiff
path: root/Master/texmf/scripts
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-01-13 14:15:17 +0000
committerNorbert Preining <preining@logic.at>2009-01-13 14:15:17 +0000
commit2a180befc695e8bc720e3b0df80eb7506812d727 (patch)
tree541730adb983e7cdaf0498cf41372bd31853e398 /Master/texmf/scripts
parentd769752e6aa15bfa1248da17893c017383e54c78 (diff)
create updmap.cfg in TEXMFSYSCONFIG instead of TEXMFSYSVAR
git-svn-id: svn://tug.org/texlive/trunk@11854 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf/scripts')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl11
1 files changed, 10 insertions, 1 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index 19fc033a7e8..14a7fe1c47c 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1767,7 +1767,16 @@ sub action_generate {
my $what = shift @ARGV;
init_local_db();
+ # we create fmtutil.cnf, language.dat, language.def in TEXMFSYSVAR
+ # and updmap.cfg in TEXMFSYSCONFIG. The reason is that calls to
+ # updmap-sys (as is done by the tlmgr update call when packages with
+ # maps are installed) will create the updmap.cfg file in TEXMFSYSCONFIG
+ # from the version in TEXMFSYSVAR. But after that the TEXMFSYSCONFIG
+ # takes precedence and the mechanism explained in updmap.cfg header
+ # does not work.
+ #
chomp (my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
+ chomp (my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`);
chomp (my $TEXMFLOCAL = `kpsewhich -var-value=TEXMFLOCAL`);
if ($what =~ m/^language(\.dat|\.def)?$/i) {
@@ -1792,7 +1801,7 @@ sub action_generate {
TeXLive::TLUtils::create_fmtutil($localtlpdb, $dest, $localconf);
} elsif ($what =~ m/^updmap$/i) {
- $dest ||= "$TEXMFSYSVAR/web2c/updmap.cfg";
+ $dest ||= "$TEXMFSYSCONFIG/web2c/updmap.cfg";
$localconf ||= "$TEXMFLOCAL/web2c/updmap-local.cfg";
debug("$0: writing new updmap.cfg to $dest\n");
TeXLive::TLUtils::create_updmap($localtlpdb, $dest, $localconf);