diff options
| -rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index f63b531361a..4765b15d77e 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -3204,6 +3204,10 @@ sub action_generate { chomp (my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`); chomp (my $TEXMFLOCAL = `kpsewhich -var-value=TEXMFLOCAL`); + # we do generate all config files, treat $opts{"dest"} as pattern + # and make it append the respective extensions + my $append_extension = (($opts{"dest"} && ($what eq "language")) ? 1 : 0); + if ($what =~ m/^language(\.dat|\.def|\.dat\.lua)?$/i) { # # if --rebuild-sys is given *and* --dest we warn that this might not @@ -3219,6 +3223,7 @@ sub action_generate { if ($what =~ m/^language(\.dat)?$/i) { my $dest = $opts{"dest"} || "$TEXMFSYSVAR/tex/generic/config/language.dat"; + $dest .= ".dat" if $append_extension; my $localcfg = $opts{"localcfg"} || "$TEXMFLOCAL/tex/generic/config/language-local.dat"; debug ("$0: writing language.dat data to $dest\n"); @@ -3231,8 +3236,9 @@ sub action_generate { } } if ($what =~ m/^language(\.def)?$/i) { - my $dest = $opts{"dest"} ? $opts{"dest"} . '.def' : + my $dest = $opts{"dest"} || "$TEXMFSYSVAR/tex/generic/config/language.def"; + $dest .= ".def" if $append_extension; my $localcfg = $opts{"localcfg"} || "$TEXMFLOCAL/tex/generic/config/language-local.def"; debug("$0: writing language.def data to $dest\n"); @@ -3245,8 +3251,9 @@ sub action_generate { } } if ($what =~ m/^language(\.dat\.lua)?$/i) { - my $dest = $opts{"dest"} ? $opts{"dest"} . '.dat.lua' : + my $dest = $opts{"dest"} || "$TEXMFSYSVAR/tex/generic/config/language.dat.lua"; + $dest .= ".dat.lua" if $append_extension; my $localcfg = $opts{"localcfg"} || "$TEXMFLOCAL/tex/generic/config/language-local.dat.lua"; debug("$0: writing language.dat.lua data to $dest\n"); @@ -5465,8 +5472,9 @@ Options: specifies the output file (defaults to the respective location in C<TEXMFSYSVAR> for C<language*> and C<fmtutil>, and C<TEXMFSYSCONFIG> -for C<updmap>). If C<--dest> is given to C<generate language>, its -value will be used for the C<language.dat> output, C<.def> will be +for C<updmap>). If C<--dest> is given to C<generate language>, it serves +as a basename onto which C<.dat> will be appended for the name of the +C<language.dat> output file, C<.def> will be appended to the value for the name of the C<language.def> output file, and C<.dat.lua> to the name of the C<language.dat.lua> file. (This is just to avoid overwriting; if you want a specific name for each output |