more texmf -> texmf-dist

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

9 files changed, 15 insertions, 13 deletions

diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index acd9651df49..8a3f70aaae3 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -38,7 +38,7 @@ my $exclude_pdf = {
      # 15dec12 derekn says will be fixed in next xpdf after 3.03:
      # (causes seg fault now):
   'texmf-dist/doc/latex/ocgx/demo-ocgx.pdf' => -1,
-  'texmf/dvips/tetex/config.pdf' => -1, # not a PDF file
+  'texmf-dist/dvips/tetex/config.pdf' => -1, # not a PDF file
 };
 
 # the value has no meaning here
diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy
index 2fec72bb462..344f3c458ad 100755
--- a/Master/tlpkg/bin/tl-update-asy
+++ b/Master/tlpkg/bin/tl-update-asy
@@ -108,10 +108,11 @@ elif false && $update_runtime_from_ainst; then
   svn add `!!`
 
   cd /tmp/ainst
-  diff -qr share/asymptote/ /home/texlive/karl/Master/texmf/asymptote/ | fgrep -v .svn
+  xmf=/home/texlive/karl/Master/texmf-dist
+  diff -qr share/asymptote/ $xmf/asymptote/ | fgrep -v .svn
   #svn rm ...
 
-  diff -qr share/doc/asymptote/ /home/texlive/karl/Master/texmf/doc/asymptote/ | fgrep -v .svn
+  diff -qr share/doc/asymptote/ $xmf/doc/asymptote/ | fgrep -v .svn
   #svn rm ...
 
   scom -m"asymptote $ver" $ci
diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index 978cea82ef0..140c41e2252 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -179,11 +179,11 @@ same_except_for_th ()
   cmp -s $TMPDIR/seft1 $TMPDIR/seft2
 }
 
-mandir=texmf/doc/man
+mandir=texmf-dist/doc/man
 webdir=/home/httpd/html/texlive/doc
 man_update=false
 
-for script in texmf/scripts/texlive/tlmgr.pl install-tl; do
+for script in texmf-dist/scripts/texlive/tlmgr.pl install-tl; do
   pod2man $script >$temp
 
   basescript=`basename $script .pl`
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index f415e248cd5..43ad50f295e 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -4,6 +4,7 @@
 
 vc_id='$Id$'
 unset CDPATH
+unset GREP_OPTIONS
 unset LS_COLORS
 
 tmpdir=${TMPDIR-/tmp}/tlupbin.$$
@@ -132,7 +133,7 @@ for tlname in $tlnames; do
     grab="$download -O $download_loc"
     $grab ftp://ftp.cea.fr/incoming/y2k01/braslau/i386-unknown-kfreebsd9.0-gnu.tar.xz;;
    i386-linux)
-    default_bin_loc=/home/texlive/sarge/tmp/source/inst/bin/i686-pc-linux-gnu;;
+    default_bin_loc=/home/texlive/karl/Build/source/inst/bin/i686-pc-linux-gnu;;
    i386-netbsd)
     download_loc=$tmpdir/tl.$tlname.tar.xz
     default_bin_loc=$download_loc
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index b324e2d626d..ba6331ddfb5 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -87,7 +87,7 @@ MAKEINST ()
   
   # included preformatted doc in new dir for the DVD.
   mkdir $imgdir/texlive-doc
-  (cd $master/texmf/doc/texlive && tar cf - \
+  (cd $master/texmf-dist/doc/texlive && tar cf - \
      index.html */*.html */*.pdf */*.png \
    | (cd $imgdir/texlive-doc && tar xf -))
   
diff --git a/Master/tlpkg/bin/tl-update-man b/Master/tlpkg/bin/tl-update-man
index b2b3a2cf4a9..385690ed152 100755
--- a/Master/tlpkg/bin/tl-update-man
+++ b/Master/tlpkg/bin/tl-update-man
@@ -15,11 +15,11 @@ Build_inst=`cd $Build/source/inst && pwd`
 
 for sect in 1 5; do
   # existing:
-  rundir=$Master/texmf/doc/man/man$sect
+  rundir=$Master/texmf-dist/doc/man/man$sect
   (cd $rundir && ls) >$TMPDIR/now
 
   # from a current build:
-  cd $Build_inst/texmf/doc/man/man$sect || exit 1
+  cd $Build_inst/texmf-dist/doc/man/man$sect || exit 1
   ls >$TMPDIR/new
 
   # copy files from build to runtime:
diff --git a/Master/tlpkg/bin/tl-update-messages b/Master/tlpkg/bin/tl-update-messages
index 57cad51c41d..cd15cf7c8df 100755
--- a/Master/tlpkg/bin/tl-update-messages
+++ b/Master/tlpkg/bin/tl-update-messages
@@ -23,7 +23,7 @@ xgettext -o tlpkg/translations/messages.pot	\
         -k__ -k\$__ -k%__ -k__x -k__n:1,2 -k__nx:1,2 -k__xn:1,2 -kN__ -k  \
        tlpkg/installer/install-menu-wizard.pl \
        tlpkg/installer/install-menu-perltk.pl \
-       texmf/scripts/texlive/tlmgrgui.pl      \
+       texmf-dist/scripts/texlive/tlmgrgui.pl \
        $tmpfile
 rm $tmpfile
 
diff --git a/Master/tlpkg/bin/tl-update-tlpdb b/Master/tlpkg/bin/tl-update-tlpdb
index 536e86061ee..f24f24618af 100755
--- a/Master/tlpkg/bin/tl-update-tlpdb
+++ b/Master/tlpkg/bin/tl-update-tlpdb
@@ -449,7 +449,7 @@ tl-update-tlpdb [OPTION]... [TLPSRC]...
 =item B<--catalogue> I<Catalogue_file>
 
 The I<Catalogue_file> must point to a valid TeX Catalogue as a Perl data
-dump; default is C<Master/texmf/scripts/texlive/var/texcatalogue.data>,
+dump; default is C<Master/texmf-dist/scripts/texlive/var/texcatalogue.data>,
 where C<Master> is the master directory described below.  That file is
 update nightly by the C<tl-update-auto> script.  If this file is given
 and readable, the generated tlpobj files will contain information
diff --git a/Master/tlpkg/bin/tl-update-txi b/Master/tlpkg/bin/tl-update-txi
index 155557818eb..37e1545f1f9 100755
--- a/Master/tlpkg/bin/tl-update-txi
+++ b/Master/tlpkg/bin/tl-update-txi
@@ -14,7 +14,7 @@ texipdf="texi2pdf --quiet --clean"
 # Convenience variables.
 mydir=`dirname $0`
 Master=`cd $mydir/../.. && pwd`
-docdir=$Master/texmf/doc
+docdir=$Master/texmf-dist/doc
 infodir=$docdir/info  
 
 Build=`cd $Master/../Build && pwd`
@@ -38,7 +38,7 @@ do_dvips() {
   $texihtml $mypkg.texi && mvcp-if-change $mypkg.html $docdir/$mypkg/
   if texi2dvi --quiet --clean $mypkg.texi; then
     # raw PostScript examples
-    mainmap=$Master/texmf/fonts/map/dvips/updmap/psfonts.map
+    mainmap=$Master/texmf-dist/fonts/map/dvips/updmap/psfonts.map
     dvips -q -t letter -u $mainmap $mypkg.dvi
     /usr/bin/ps2pdf $mypkg.ps
     mv -v $mypkg.pdf $docdir/$mypkg/