From afe0c6d8ec93fc52d52ffe0f91ba74fda9e9d9ee Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 7 Apr 2013 22:25:27 +0000 Subject: texmf -> texmf-dist git-svn-id: svn://tug.org/texlive/trunk@29727 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 26 +++++++++++++------------- Master/texmf-dist/scripts/texlive/tlmgr.pl | 8 ++++---- 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 = ; 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 <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 -- cgit v1.2.3