summaryrefslogtreecommitdiff
path: root/Master/tlpkg/TeXLive/TLUtils.pm
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/TeXLive/TLUtils.pm')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm31
1 files changed, 17 insertions, 14 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index d79522b9b17..8dcc0d603a5 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1978,24 +1978,26 @@ sub add_remove_symlinks {
return if win32();
if ($mode eq "add") {
$errors++ unless add_link_dir_dir($plat_bindir, $sys_bin);
- if (-d "$Master/texmf/doc/info") {
- $errors++ unless add_link_dir_dir("$Master/texmf/doc/info", $sys_info);
+ if (-d "$Master/texmf-dist/doc/info") {
+ $errors++
+ unless add_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info);
}
} elsif ($mode eq "remove") {
$errors++ unless remove_link_dir_dir($plat_bindir, $sys_bin);
- if (-d "$Master/texmf/doc/info") {
- $errors++ unless remove_link_dir_dir("$Master/texmf/doc/info", $sys_info);
+ if (-d "$Master/texmf-dist/doc/info") {
+ $errors++
+ unless remove_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info);
}
} else {
die ("should not happen, unknown mode $mode in add_remove_symlinks!");
}
mkdirhier $sys_man if ($mode eq "add");
- if (-w $sys_man && -d "$Master/texmf/doc/man") {
+ if (-w $sys_man && -d "$Master/texmf-dist/doc/man") {
debug("$mode symlinks for man pages in $sys_man\n");
- my $foo = `(cd "$Master/texmf/doc/man" && echo *)`;
+ my $foo = `(cd "$Master/texmf-dist/doc/man" && echo *)`;
chomp (my @mans = split (' ', $foo));
foreach my $m (@mans) {
- my $mandir = "$Master/texmf/doc/man/$m";
+ my $mandir = "$Master/texmf-dist/doc/man/$m";
next unless -d $mandir;
if ($mode eq "add") {
$errors++ unless add_link_dir_dir($mandir, "$sys_man/$m");
@@ -2689,7 +2691,7 @@ sub create_fmtutil {
my ($tlpdb,$dest,$localconf) = @_;
my @lines = $tlpdb->fmtutil_cnf_lines(
get_disabled_local_configs($localconf, '#'));
- _create_config_files($tlpdb, "texmf/web2c/fmtutil-hdr.cnf", $dest,
+ _create_config_files($tlpdb, "texmf-dist/web2c/fmtutil-hdr.cnf", $dest,
$localconf, 0, '#', \@lines);
}
@@ -2697,7 +2699,7 @@ sub create_updmap {
my ($tlpdb,$dest) = @_;
check_for_old_updmap_cfg();
my @tlpdblines = $tlpdb->updmap_cfg_lines();
- _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest,
+ _create_config_files($tlpdb, "texmf-dist/web2c/updmap-hdr.cfg", $dest,
undef, 0, '#', \@tlpdblines);
}
@@ -2787,8 +2789,8 @@ sub create_language_dat {
# no checking for disabled stuff for language.dat and .def
my @lines = $tlpdb->language_dat_lines(
get_disabled_local_configs($localconf, '%'));
- _create_config_files($tlpdb, "texmf/tex/generic/config/language.us", $dest,
- $localconf, 0, '%', \@lines);
+ _create_config_files($tlpdb, "texmf-dist/tex/generic/config/language.us",
+ $dest, $localconf, 0, '%', \@lines);
}
sub create_language_def {
@@ -2800,7 +2802,8 @@ sub create_language_def {
push @postlines, "%%% No changes may be made beyond this point.\n";
push @postlines, "\n";
push @postlines, "\\uselanguage {USenglish} %%% This MUST be the last line of the file.\n";
- _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.def", $dest, $localconf, 1, '%', \@lines, @postlines);
+ _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.def",
+ $dest, $localconf, 1, '%', \@lines, @postlines);
}
sub create_language_lua {
@@ -2809,8 +2812,8 @@ sub create_language_lua {
my @lines = $tlpdb->language_lua_lines(
get_disabled_local_configs($localconf, '--'));
my @postlines = ("}\n");
- _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.lua",
- $dest, $localconf, 0, '--', \@lines, @postlines);
+ _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.lua",
+ $dest, $localconf, 0, '--', \@lines, @postlines);
}
sub _create_config_files {