texmf -> texmf-dist

git-svn-id: svn://tug.org/texlive/trunk@29727 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 17 insertions, 17 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 5dc2c027983..ae95af9bfa0 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -387,7 +387,7 @@ if (!$opt_custom_bin && (platform() eq "i386-cygwin")) {
   if (-d "$tmp/$Archive") {
     push @media_available, "local_compressed#$tmp";
   }
-  if (-d "$tmp/texmf/web2c") {
+  if (-d "$tmp/texmf-dist/web2c") {
     push @media_available, "local_uncompressed#$tmp";
   }
 }
@@ -406,7 +406,7 @@ if ($opt_location) {
     if (-d "$tmp/$Archive") {
       push @media_available, "local_compressed#$tmp";
     }
-    if (-d "$tmp/texmf/web2c") {
+    if (-d "$tmp/texmf-dist/web2c") {
       push @media_available, "local_uncompressed#$tmp";
     }
   }
@@ -864,8 +864,8 @@ operations might be disturbed.\n\n";
   # xxxx errcount -- check all these things and add any errors.
 
   if (!$vars{'in_place'}) {
-    info("running mktexlsr $TEXDIR/texmf-dist $TEXDIR/texmf...\n");
-    system('mktexlsr', "$TEXDIR/texmf-dist", "$TEXDIR/texmf");
+    info("running mktexlsr $TEXDIR/texmf-dist ...\n");
+    system('mktexlsr', "$TEXDIR/texmf-dist");
   }
 
   # we have to generate the various config file. That could be done with
@@ -995,8 +995,8 @@ sub do_path_adjustments {
 
 # we have to adjust the texmf.cnf file to the paths set in the configuration!
 sub do_texmf_cnf {
-  open(TMF,"<$vars{'TEXDIR'}/texmf/web2c/texmf.cnf")
-      or die "$vars{'TEXDIR'}/texmf/web2c/texmf.cnf not found: $!";
+  open(TMF,"<$vars{'TEXDIR'}/texmf-dist/web2c/texmf.cnf")
+      or die "$vars{'TEXDIR'}/texmf-dist/web2c/texmf.cnf not found: $!";
   my @texmfcnflines = <TMF>;
   close(TMF);
 
@@ -1057,7 +1057,7 @@ sub do_texmf_cnf {
 %
 % That is, if you need to make changes to texmf.cnf, put your custom
 % settings in this file, which is .../texlive/YYYY/texmf.cnf, rather than
-% the distributed file (which is .../texlive/YYYY/texmf/web2c/texmf.cnf).
+% the distributed file (which is .../texlive/YYYY/texmf-dist/web2c/texmf.cnf).
 % And include *only* your changed values, not a copy of the whole thing!
 %
 EOF
@@ -1068,13 +1068,13 @@ EOF
   }
   #
   # save the setting of shell_escape to the generated system texmf.cnf
-  # default in texmf/web2c/texmf.cnf is
+  # default in texmf-dist/web2c/texmf.cnf is
   #   shell_escape = p
   # so we write that only if the user *deselected* this option
   if (!$vars{"option_write18_restricted"}) {
     print TMF <<EOF;
 
-% Disable system commands via \\write18{...}.  See texmf/web2c/texmf.cnf.
+% Disable system commands via \\write18{...}.  See texmf-dist/web2c/texmf.cnf.
 shell_escape = 0
 EOF
 ;
@@ -1090,7 +1090,7 @@ EOF
 --
 -- That is, if you need to make changes to texmfcnf.lua, put your custom
 -- settings in this file, which is .../texlive/YYYY/texmfcnf.lua, rather than
--- the distributed file (which is .../texlive/YYYY/texmf/web2c/texmfcnf.lua).
+-- the distributed file (.../texlive/YYYY/texmf-dist/web2c/texmfcnf.lua).
 -- And include *only* your changed values, not a copy of the whole thing!
 
 return { 
@@ -1109,7 +1109,7 @@ EOF
   if (!$vars{"option_write18_restricted"}) {
     print TMFLUA <<EOF;
   directives = {
-       -- Disable system commands.  See texmf/web2c/texmfcnf.lua
+       -- Disable system commands.  See texmf-dist/web2c/texmfcnf.lua
     ["system.commandmode"]       = "none",
   },
 EOF
@@ -1968,8 +1968,8 @@ sub welcome_paths {
 
   $welcome .= <<"EOF";
 
- Add $::vars{'TEXDIR'}/texmf/doc/man to MANPATH, if not dynamically determined.
- Add $::vars{'TEXDIR'}/texmf/doc/info to INFOPATH.
+ Add $::vars{'TEXDIR'}/texmf-dist/doc/man to MANPATH, if not dynamically found.
+ Add $::vars{'TEXDIR'}/texmf-dist/doc/info to INFOPATH.
 EOF
 
   $welcome .= <<"EOF";
diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl
index e4a63e2bfcf..1514ad14c9d 100755
--- a/Master/texmf-dist/scripts/texlive/tlmgr.pl
+++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl
@@ -41,7 +41,7 @@ BEGIN {
     $Master = __FILE__;
     $Master =~ s!\\!/!g;
     $Master =~ s![^/]*$!../../..!
-      unless ($Master =~ s!/texmf/scripts/texlive/tlmgr\.pl$!!i);
+      unless ($Master =~ s!/texmf-dist/scripts/texlive/tlmgr\.pl$!!i);
     $bindir = "$Master/bin/win32";
     $kpsewhichname = "kpsewhich.exe";
     # path already set by wrapper batchfile
@@ -69,7 +69,7 @@ BEGIN {
   #
   # make Perl find our packages first:
   unshift (@INC, "$Master/tlpkg");
-  unshift (@INC, "$Master/texmf/scripts/texlive");
+  unshift (@INC, "$Master/texmf-dist/scripts/texlive");
 }
 
 use Cwd qw/abs_path/;
@@ -1379,7 +1379,7 @@ sub load_taxonomy_datafile {
   init_local_db();
   my $taxonomy;
   my $fpath = $localtlpdb->root
-              . "/texmf/scripts/texlive/var/texcatalogue.keywords";
+              . "/texmf-dist/scripts/texlive/var/texcatalogue.keywords";
   if (! -r $fpath) {
     tlwarn("tlmgr: taxonomy file $fpath not readable: $!\n");
     return;
@@ -4590,7 +4590,7 @@ sub check_files {
   #
   my @IgnorePatterns = qw!
     support/ source/ setuptl/
-    texmf-dist/ls-R$ texmf-doc/ls-R$ texmf/ls-R$
+    texmf-dist/ls-R$ texmf-doc/ls-R$
     tlpkg/tlpsrc tlpkg/bin tlpkg/lib/ tlpkg/libexec tlpkg/tests/ tlpkg/etc
     tlpkg/texlive.tlpdb
     tlpkg/tlpobj