summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2010-01-10 00:47:15 +0000
committerNorbert Preining <preining@logic.at>2010-01-10 00:47:15 +0000
commitc73c58ae351884f237dd3f0882f01596389f0120 (patch)
treeb4262d647d79390fadda32363d30c85a88ffc982 /Master
parent059968f82b4a430beea78b83d02927ae07114f90 (diff)
use the default $dest for language.def/dat in the --byhyphen call
git-svn-id: svn://tug.org/texlive/trunk@16652 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl22
1 files changed, 4 insertions, 18 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index bc1894d7a0d..3d26f91b238 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -2984,12 +2984,6 @@ sub action_generate {
# searching for language.(dat/def) does search in the right place
my $ldat;
my $ldef;
- if ($opts{"rebuild-sys"}) {
- $ENV{"TEXMFVAR"} = $TEXMFSYSVAR;
- $ENV{"TEXMFCONFIG"} = $TEXMFSYSCONFIG;
- chomp ($ldat = `kpsewhich language.dat`);
- chomp ($ldef = `kpsewhich language.def`);
- }
if ($what =~ m/^language(\.dat)?$/i) {
$dest ||= "$TEXMFSYSVAR/tex/generic/config/language.dat";
$localconf ||= "$TEXMFLOCAL/tex/generic/config/language-local.dat";
@@ -3001,14 +2995,10 @@ sub action_generate {
undef $dest;
}
if ($opts{"rebuild-sys"}) {
- if ($ldat =~ m/^[[:space:]]*$/) {
- tlwarn("Cannot find language.dat, not updating formats using it.\n");
- } else {
- do_cmd_and_check("fmtutil-sys --byhyphen $ldat");
- }
+ do_cmd_and_check("fmtutil-sys --byhyphen $dest");
} else {
info("To make the newly-generated language.dat take effect,"
- . " run fmtutil-sys --byhyphen $ldat.\n");
+ . " run fmtutil-sys --byhyphen $dest.\n");
}
}
if ($what =~ m/^language(\.def)?$/i) {
@@ -3017,14 +3007,10 @@ sub action_generate {
debug("$0: writing language.def data to $dest\n");
TeXLive::TLUtils::create_language_def($localtlpdb, $dest, $localconf);
if ($opts{"rebuild-sys"}) {
- if ($ldef =~ m/^[[:space:]]*$/) {
- tlwarn("Cannot find language.def, not updating formats using it.\n");
- } else {
- do_cmd_and_check("fmtutil-sys --byhyphen $ldef");
- }
+ do_cmd_and_check("fmtutil-sys --byhyphen $dest");
} else {
info("To make the newly-generated language.def take effect,"
- . " run fmtutil-sys --byhyphen $ldef.\n");
+ . " run fmtutil-sys --byhyphen $dest.\n");
}
}