Move some linked scripts from texmf/ to texmf-dist/

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

115 files changed, 114 insertions, 110 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 8bf42e3f964..e67e62c83c6 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (texmf_*_scripts): Move a2ping/, simpdftex/,
+	tetex/, and texdoc/ scripts from texmf/ to texmf-dist/.
+
 2012-07-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am (bin_links) [WIN32]: Skip shell script links.
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 93abf1ef758..685179766ec 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -37,13 +37,8 @@ bin_SCRIPTS =
 #
 texmf_scriptsdir = $(datarootdir)/texmf/scripts
 ## We distinguish shell and other (perl, lua, python, ruby, ...) scripts.
-texmf_shell_scripts = \
-	simpdftex/simpdftex
+texmf_shell_scripts =
 texmf_other_scripts = \
-	a2ping/a2ping.pl \
-	tetex/e2pall.pl \
-	tetex/texdoctk.pl \
-	texdoc/texdoc.tlu \
 	texlive/rungs.tlu \
 	texlive/tlmgr.pl
 nobase_dist_texmf_scripts_SCRIPTS = \
@@ -71,8 +66,10 @@ texmf_dist_shell_scripts = \
 	pdfjam/pdfnup \
 	pdfjam/pdfpun \
 	pst-pdf/ps4pdf \
+	simpdftex/simpdftex \
 	typeoutfileinfo/typeoutfileinfo.sh
 texmf_dist_other_scripts = \
+	a2ping/a2ping.pl \
 	accfonts/mkt1font \
 	accfonts/vpl2ovp \
 	accfonts/vpl2vpl \
@@ -126,6 +123,9 @@ texmf_dist_other_scripts = \
 	splitindex/perl/splitindex.pl \
 	sty2dtx/sty2dtx.pl \
 	svn-multi/svn-multi.pl \
+	tetex/e2pall.pl \
+	tetex/texdoctk.pl \
+	texdoc/texdoc.tlu \
 	texcount/texcount.pl \
 	texdef/texdef.pl \
 	texdiff/texdiff \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 30d2c2633af..ac7e0498dd2 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -218,14 +218,8 @@ bin_SCRIPTS =
 # The instances in texmf* are the masters (except when it is CTAN).
 #
 texmf_scriptsdir = $(datarootdir)/texmf/scripts
-texmf_shell_scripts = \
-	simpdftex/simpdftex
-
+texmf_shell_scripts = 
 texmf_other_scripts = \
-	a2ping/a2ping.pl \
-	tetex/e2pall.pl \
-	tetex/texdoctk.pl \
-	texdoc/texdoc.tlu \
 	texlive/rungs.tlu \
 	texlive/tlmgr.pl
 
@@ -254,9 +248,11 @@ texmf_dist_shell_scripts = \
 	pdfjam/pdfnup \
 	pdfjam/pdfpun \
 	pst-pdf/ps4pdf \
+	simpdftex/simpdftex \
 	typeoutfileinfo/typeoutfileinfo.sh
 
 texmf_dist_other_scripts = \
+	a2ping/a2ping.pl \
 	accfonts/mkt1font \
 	accfonts/vpl2ovp \
 	accfonts/vpl2vpl \
@@ -310,6 +306,9 @@ texmf_dist_other_scripts = \
 	splitindex/perl/splitindex.pl \
 	sty2dtx/sty2dtx.pl \
 	svn-multi/svn-multi.pl \
+	tetex/e2pall.pl \
+	tetex/texdoctk.pl \
+	texdoc/texdoc.tlu \
 	texcount/texcount.pl \
 	texdef/texdef.pl \
 	texdiff/texdiff \
diff --git a/Build/source/texk/texlive/linked_scripts/scripts.lst b/Build/source/texk/texlive/linked_scripts/scripts.lst
index 976a410a4ce..924e0a11e0b 100644
--- a/Build/source/texk/texlive/linked_scripts/scripts.lst
+++ b/Build/source/texk/texlive/linked_scripts/scripts.lst
@@ -1,9 +1,4 @@
 texmf_scripts='
-simpdftex/simpdftex
-a2ping/a2ping.pl
-tetex/e2pall.pl
-tetex/texdoctk.pl
-texdoc/texdoc.tlu
 texlive/rungs.tlu
 texlive/tlmgr.pl
 '
@@ -27,7 +22,9 @@ pdfjam/pdfjoin
 pdfjam/pdfnup
 pdfjam/pdfpun
 pst-pdf/ps4pdf
+simpdftex/simpdftex
 typeoutfileinfo/typeoutfileinfo.sh
+a2ping/a2ping.pl
 accfonts/mkt1font
 accfonts/vpl2ovp
 accfonts/vpl2vpl
@@ -81,6 +78,9 @@ purifyeps/purifyeps
 splitindex/perl/splitindex.pl
 sty2dtx/sty2dtx.pl
 svn-multi/svn-multi.pl
+tetex/e2pall.pl
+tetex/texdoctk.pl
+texdoc/texdoc.tlu
 texcount/texcount.pl
 texdef/texdef.pl
 texdiff/texdiff
diff --git a/Master/bin/alpha-linux/a2ping b/Master/bin/alpha-linux/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/alpha-linux/a2ping
+++ b/Master/bin/alpha-linux/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/e2pall b/Master/bin/alpha-linux/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/alpha-linux/e2pall
+++ b/Master/bin/alpha-linux/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/simpdftex b/Master/bin/alpha-linux/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/alpha-linux/simpdftex
+++ b/Master/bin/alpha-linux/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/texdoc b/Master/bin/alpha-linux/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/alpha-linux/texdoc
+++ b/Master/bin/alpha-linux/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/alpha-linux/texdoctk b/Master/bin/alpha-linux/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/alpha-linux/texdoctk
+++ b/Master/bin/alpha-linux/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/a2ping b/Master/bin/amd64-freebsd/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/amd64-freebsd/a2ping
+++ b/Master/bin/amd64-freebsd/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/e2pall b/Master/bin/amd64-freebsd/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/amd64-freebsd/e2pall
+++ b/Master/bin/amd64-freebsd/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/simpdftex b/Master/bin/amd64-freebsd/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/amd64-freebsd/simpdftex
+++ b/Master/bin/amd64-freebsd/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/texdoc b/Master/bin/amd64-freebsd/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/amd64-freebsd/texdoc
+++ b/Master/bin/amd64-freebsd/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/texdoctk b/Master/bin/amd64-freebsd/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/amd64-freebsd/texdoctk
+++ b/Master/bin/amd64-freebsd/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/a2ping b/Master/bin/amd64-kfreebsd/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/amd64-kfreebsd/a2ping
+++ b/Master/bin/amd64-kfreebsd/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/e2pall b/Master/bin/amd64-kfreebsd/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/amd64-kfreebsd/e2pall
+++ b/Master/bin/amd64-kfreebsd/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/simpdftex b/Master/bin/amd64-kfreebsd/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/amd64-kfreebsd/simpdftex
+++ b/Master/bin/amd64-kfreebsd/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/texdoc b/Master/bin/amd64-kfreebsd/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/amd64-kfreebsd/texdoc
+++ b/Master/bin/amd64-kfreebsd/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/texdoctk b/Master/bin/amd64-kfreebsd/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/amd64-kfreebsd/texdoctk
+++ b/Master/bin/amd64-kfreebsd/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/armel-linux/a2ping b/Master/bin/armel-linux/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/armel-linux/a2ping
+++ b/Master/bin/armel-linux/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/armel-linux/e2pall b/Master/bin/armel-linux/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/armel-linux/e2pall
+++ b/Master/bin/armel-linux/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/armel-linux/simpdftex b/Master/bin/armel-linux/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/armel-linux/simpdftex
+++ b/Master/bin/armel-linux/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/armel-linux/texdoc b/Master/bin/armel-linux/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/armel-linux/texdoc
+++ b/Master/bin/armel-linux/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/armel-linux/texdoctk b/Master/bin/armel-linux/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/armel-linux/texdoctk
+++ b/Master/bin/armel-linux/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/a2ping b/Master/bin/i386-cygwin/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/i386-cygwin/a2ping
+++ b/Master/bin/i386-cygwin/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/e2pall b/Master/bin/i386-cygwin/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/i386-cygwin/e2pall
+++ b/Master/bin/i386-cygwin/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/simpdftex b/Master/bin/i386-cygwin/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/i386-cygwin/simpdftex
+++ b/Master/bin/i386-cygwin/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/texdoc b/Master/bin/i386-cygwin/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/i386-cygwin/texdoc
+++ b/Master/bin/i386-cygwin/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/texdoctk b/Master/bin/i386-cygwin/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/i386-cygwin/texdoctk
+++ b/Master/bin/i386-cygwin/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/a2ping b/Master/bin/i386-freebsd/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/i386-freebsd/a2ping
+++ b/Master/bin/i386-freebsd/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/e2pall b/Master/bin/i386-freebsd/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/i386-freebsd/e2pall
+++ b/Master/bin/i386-freebsd/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/simpdftex b/Master/bin/i386-freebsd/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/i386-freebsd/simpdftex
+++ b/Master/bin/i386-freebsd/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/texdoc b/Master/bin/i386-freebsd/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/i386-freebsd/texdoc
+++ b/Master/bin/i386-freebsd/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/texdoctk b/Master/bin/i386-freebsd/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/i386-freebsd/texdoctk
+++ b/Master/bin/i386-freebsd/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/a2ping b/Master/bin/i386-kfreebsd/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/i386-kfreebsd/a2ping
+++ b/Master/bin/i386-kfreebsd/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/e2pall b/Master/bin/i386-kfreebsd/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/i386-kfreebsd/e2pall
+++ b/Master/bin/i386-kfreebsd/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/simpdftex b/Master/bin/i386-kfreebsd/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/i386-kfreebsd/simpdftex
+++ b/Master/bin/i386-kfreebsd/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/texdoc b/Master/bin/i386-kfreebsd/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/i386-kfreebsd/texdoc
+++ b/Master/bin/i386-kfreebsd/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/texdoctk b/Master/bin/i386-kfreebsd/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/i386-kfreebsd/texdoctk
+++ b/Master/bin/i386-kfreebsd/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/i386-linux/a2ping b/Master/bin/i386-linux/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/i386-linux/a2ping
+++ b/Master/bin/i386-linux/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/i386-linux/e2pall b/Master/bin/i386-linux/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/i386-linux/e2pall
+++ b/Master/bin/i386-linux/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/i386-linux/simpdftex b/Master/bin/i386-linux/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/i386-linux/simpdftex
+++ b/Master/bin/i386-linux/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/i386-linux/texdoc b/Master/bin/i386-linux/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/i386-linux/texdoc
+++ b/Master/bin/i386-linux/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/i386-linux/texdoctk b/Master/bin/i386-linux/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/i386-linux/texdoctk
+++ b/Master/bin/i386-linux/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/a2ping b/Master/bin/i386-solaris/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/i386-solaris/a2ping
+++ b/Master/bin/i386-solaris/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/e2pall b/Master/bin/i386-solaris/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/i386-solaris/e2pall
+++ b/Master/bin/i386-solaris/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/simpdftex b/Master/bin/i386-solaris/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/i386-solaris/simpdftex
+++ b/Master/bin/i386-solaris/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/texdoc b/Master/bin/i386-solaris/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/i386-solaris/texdoc
+++ b/Master/bin/i386-solaris/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/texdoctk b/Master/bin/i386-solaris/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/i386-solaris/texdoctk
+++ b/Master/bin/i386-solaris/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/mipsel-linux/a2ping b/Master/bin/mipsel-linux/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/mipsel-linux/a2ping
+++ b/Master/bin/mipsel-linux/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/mipsel-linux/e2pall b/Master/bin/mipsel-linux/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/mipsel-linux/e2pall
+++ b/Master/bin/mipsel-linux/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/mipsel-linux/simpdftex b/Master/bin/mipsel-linux/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/mipsel-linux/simpdftex
+++ b/Master/bin/mipsel-linux/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/mipsel-linux/texdoc b/Master/bin/mipsel-linux/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/mipsel-linux/texdoc
+++ b/Master/bin/mipsel-linux/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/mipsel-linux/texdoctk b/Master/bin/mipsel-linux/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/mipsel-linux/texdoctk
+++ b/Master/bin/mipsel-linux/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/a2ping b/Master/bin/powerpc-aix/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/powerpc-aix/a2ping
+++ b/Master/bin/powerpc-aix/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/e2pall b/Master/bin/powerpc-aix/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/powerpc-aix/e2pall
+++ b/Master/bin/powerpc-aix/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/simpdftex b/Master/bin/powerpc-aix/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/powerpc-aix/simpdftex
+++ b/Master/bin/powerpc-aix/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/texdoc b/Master/bin/powerpc-aix/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/powerpc-aix/texdoc
+++ b/Master/bin/powerpc-aix/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/texdoctk b/Master/bin/powerpc-aix/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/powerpc-aix/texdoctk
+++ b/Master/bin/powerpc-aix/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/a2ping b/Master/bin/powerpc-linux/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/powerpc-linux/a2ping
+++ b/Master/bin/powerpc-linux/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/e2pall b/Master/bin/powerpc-linux/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/powerpc-linux/e2pall
+++ b/Master/bin/powerpc-linux/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/simpdftex b/Master/bin/powerpc-linux/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/powerpc-linux/simpdftex
+++ b/Master/bin/powerpc-linux/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/texdoc b/Master/bin/powerpc-linux/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/powerpc-linux/texdoc
+++ b/Master/bin/powerpc-linux/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/texdoctk b/Master/bin/powerpc-linux/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/powerpc-linux/texdoctk
+++ b/Master/bin/powerpc-linux/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/a2ping b/Master/bin/sparc-solaris/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/sparc-solaris/a2ping
+++ b/Master/bin/sparc-solaris/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/e2pall b/Master/bin/sparc-solaris/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/sparc-solaris/e2pall
+++ b/Master/bin/sparc-solaris/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/simpdftex b/Master/bin/sparc-solaris/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/sparc-solaris/simpdftex
+++ b/Master/bin/sparc-solaris/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/texdoc b/Master/bin/sparc-solaris/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/sparc-solaris/texdoc
+++ b/Master/bin/sparc-solaris/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/texdoctk b/Master/bin/sparc-solaris/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/sparc-solaris/texdoctk
+++ b/Master/bin/sparc-solaris/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/a2ping b/Master/bin/universal-darwin/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/universal-darwin/a2ping
+++ b/Master/bin/universal-darwin/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/e2pall b/Master/bin/universal-darwin/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/universal-darwin/e2pall
+++ b/Master/bin/universal-darwin/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/simpdftex b/Master/bin/universal-darwin/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/universal-darwin/simpdftex
+++ b/Master/bin/universal-darwin/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/texdoc b/Master/bin/universal-darwin/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/universal-darwin/texdoc
+++ b/Master/bin/universal-darwin/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/texdoctk b/Master/bin/universal-darwin/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/universal-darwin/texdoctk
+++ b/Master/bin/universal-darwin/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/a2ping b/Master/bin/x86_64-darwin/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/x86_64-darwin/a2ping
+++ b/Master/bin/x86_64-darwin/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/e2pall b/Master/bin/x86_64-darwin/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/x86_64-darwin/e2pall
+++ b/Master/bin/x86_64-darwin/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/simpdftex b/Master/bin/x86_64-darwin/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/x86_64-darwin/simpdftex
+++ b/Master/bin/x86_64-darwin/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/texdoc b/Master/bin/x86_64-darwin/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/x86_64-darwin/texdoc
+++ b/Master/bin/x86_64-darwin/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/texdoctk b/Master/bin/x86_64-darwin/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/x86_64-darwin/texdoctk
+++ b/Master/bin/x86_64-darwin/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/a2ping b/Master/bin/x86_64-linux/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/x86_64-linux/a2ping
+++ b/Master/bin/x86_64-linux/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/e2pall b/Master/bin/x86_64-linux/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/x86_64-linux/e2pall
+++ b/Master/bin/x86_64-linux/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/simpdftex b/Master/bin/x86_64-linux/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/x86_64-linux/simpdftex
+++ b/Master/bin/x86_64-linux/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/texdoc b/Master/bin/x86_64-linux/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/x86_64-linux/texdoc
+++ b/Master/bin/x86_64-linux/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/texdoctk b/Master/bin/x86_64-linux/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/x86_64-linux/texdoctk
+++ b/Master/bin/x86_64-linux/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/a2ping b/Master/bin/x86_64-solaris/a2ping
index 5cbfe106996..732137ba3be 120000
--- a/Master/bin/x86_64-solaris/a2ping
+++ b/Master/bin/x86_64-solaris/a2ping
@@ -1 +1 @@
-../../texmf/scripts/a2ping/a2ping.pl
\ No newline at end of file
+../../texmf-dist/scripts/a2ping/a2ping.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/e2pall b/Master/bin/x86_64-solaris/e2pall
index 47465883225..9e3fd9458a0 120000
--- a/Master/bin/x86_64-solaris/e2pall
+++ b/Master/bin/x86_64-solaris/e2pall
@@ -1 +1 @@
-../../texmf/scripts/tetex/e2pall.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/e2pall.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/simpdftex b/Master/bin/x86_64-solaris/simpdftex
index 8b9c2132185..815fe69157d 120000
--- a/Master/bin/x86_64-solaris/simpdftex
+++ b/Master/bin/x86_64-solaris/simpdftex
@@ -1 +1 @@
-../../texmf/scripts/simpdftex/simpdftex
\ No newline at end of file
+../../texmf-dist/scripts/simpdftex/simpdftex
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/texdoc b/Master/bin/x86_64-solaris/texdoc
index 90a4a24bcb0..1727f746f0d 120000
--- a/Master/bin/x86_64-solaris/texdoc
+++ b/Master/bin/x86_64-solaris/texdoc
@@ -1 +1 @@
-../../texmf/scripts/texdoc/texdoc.tlu
\ No newline at end of file
+../../texmf-dist/scripts/texdoc/texdoc.tlu
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/texdoctk b/Master/bin/x86_64-solaris/texdoctk
index 56729104154..2f77846ff06 120000
--- a/Master/bin/x86_64-solaris/texdoctk
+++ b/Master/bin/x86_64-solaris/texdoctk
@@ -1 +1 @@
-../../texmf/scripts/tetex/texdoctk.pl
\ No newline at end of file
+../../texmf-dist/scripts/tetex/texdoctk.pl
\ No newline at end of file
diff --git a/Master/texmf/doc/texdoc/News b/Master/texmf-dist/doc/texdoc/News
index caad4f51959..caad4f51959 100644
--- a/Master/texmf/doc/texdoc/News
+++ b/Master/texmf-dist/doc/texdoc/News
diff --git a/Master/texmf/doc/texdoc/texdoc.pdf b/Master/texmf-dist/doc/texdoc/texdoc.pdf
index 9de6754f92c..9de6754f92c 100644
--- a/Master/texmf/doc/texdoc/texdoc.pdf
+++ b/Master/texmf-dist/doc/texdoc/texdoc.pdf
diff --git a/Master/texmf/doc/texdoc/texdoc.tex b/Master/texmf-dist/doc/texdoc/texdoc.tex
index 817489f697b..817489f697b 100644
--- a/Master/texmf/doc/texdoc/texdoc.tex
+++ b/Master/texmf-dist/doc/texdoc/texdoc.tex
diff --git a/Master/texmf/scripts/a2ping/a2ping.pl b/Master/texmf-dist/scripts/a2ping/a2ping.pl
index 39331beb795..39331beb795 100755
--- a/Master/texmf/scripts/a2ping/a2ping.pl
+++ b/Master/texmf-dist/scripts/a2ping/a2ping.pl
diff --git a/Master/texmf/scripts/simpdftex/simpdftex b/Master/texmf-dist/scripts/simpdftex/simpdftex
index e5d5d4218b3..e5d5d4218b3 100755
--- a/Master/texmf/scripts/simpdftex/simpdftex
+++ b/Master/texmf-dist/scripts/simpdftex/simpdftex
diff --git a/Master/texmf/scripts/tetex/e2pall.pl b/Master/texmf-dist/scripts/tetex/e2pall.pl
index 2997f8b1102..2997f8b1102 100755
--- a/Master/texmf/scripts/tetex/e2pall.pl
+++ b/Master/texmf-dist/scripts/tetex/e2pall.pl
diff --git a/Master/texmf/scripts/tetex/texdoctk.pl b/Master/texmf-dist/scripts/tetex/texdoctk.pl
index 36497183e3b..36497183e3b 100755
--- a/Master/texmf/scripts/tetex/texdoctk.pl
+++ b/Master/texmf-dist/scripts/tetex/texdoctk.pl
diff --git a/Master/texmf/scripts/texdoc/Data.meta.lua b/Master/texmf-dist/scripts/texdoc/Data.meta.lua
index 97083bc157a..97083bc157a 100644
--- a/Master/texmf/scripts/texdoc/Data.meta.lua
+++ b/Master/texmf-dist/scripts/texdoc/Data.meta.lua
diff --git a/Master/texmf/scripts/texdoc/Data.tlpdb.lua b/Master/texmf-dist/scripts/texdoc/Data.tlpdb.lua
index 8eb3a57464c..8eb3a57464c 100644
--- a/Master/texmf/scripts/texdoc/Data.tlpdb.lua
+++ b/Master/texmf-dist/scripts/texdoc/Data.tlpdb.lua
diff --git a/Master/texmf/scripts/texdoc/alias.tlu b/Master/texmf-dist/scripts/texdoc/alias.tlu
index 1ae150b5b1c..1ae150b5b1c 100644
--- a/Master/texmf/scripts/texdoc/alias.tlu
+++ b/Master/texmf-dist/scripts/texdoc/alias.tlu
diff --git a/Master/texmf/scripts/texdoc/config.tlu b/Master/texmf-dist/scripts/texdoc/config.tlu
index 0c3640c71c1..0c3640c71c1 100644
--- a/Master/texmf/scripts/texdoc/config.tlu
+++ b/Master/texmf-dist/scripts/texdoc/config.tlu
diff --git a/Master/texmf/scripts/texdoc/constants.tlu b/Master/texmf-dist/scripts/texdoc/constants.tlu
index 872a3ac7b93..872a3ac7b93 100644
--- a/Master/texmf/scripts/texdoc/constants.tlu
+++ b/Master/texmf-dist/scripts/texdoc/constants.tlu
diff --git a/Master/texmf/scripts/texdoc/functions.tlu b/Master/texmf-dist/scripts/texdoc/functions.tlu
index f1ff54eca0b..f1ff54eca0b 100644
--- a/Master/texmf/scripts/texdoc/functions.tlu
+++ b/Master/texmf-dist/scripts/texdoc/functions.tlu
diff --git a/Master/texmf/scripts/texdoc/main.tlu b/Master/texmf-dist/scripts/texdoc/main.tlu
index 8ab4648e770..8ab4648e770 100644
--- a/Master/texmf/scripts/texdoc/main.tlu
+++ b/Master/texmf-dist/scripts/texdoc/main.tlu
diff --git a/Master/texmf/scripts/texdoc/score.tlu b/Master/texmf-dist/scripts/texdoc/score.tlu
index ed5a31ebb60..ed5a31ebb60 100644
--- a/Master/texmf/scripts/texdoc/score.tlu
+++ b/Master/texmf-dist/scripts/texdoc/score.tlu
diff --git a/Master/texmf/scripts/texdoc/search.tlu b/Master/texmf-dist/scripts/texdoc/search.tlu
index 1499c65414a..1499c65414a 100644
--- a/Master/texmf/scripts/texdoc/search.tlu
+++ b/Master/texmf-dist/scripts/texdoc/search.tlu
diff --git a/Master/texmf/scripts/texdoc/texdoc.tlu b/Master/texmf-dist/scripts/texdoc/texdoc.tlu
index 919e381ec33..919e381ec33 100755
--- a/Master/texmf/scripts/texdoc/texdoc.tlu
+++ b/Master/texmf-dist/scripts/texdoc/texdoc.tlu
diff --git a/Master/texmf/scripts/texdoc/texdoclib.tlu b/Master/texmf-dist/scripts/texdoc/texdoclib.tlu
index ccaad778d93..ccaad778d93 100644
--- a/Master/texmf/scripts/texdoc/texdoclib.tlu
+++ b/Master/texmf-dist/scripts/texdoc/texdoclib.tlu
diff --git a/Master/texmf/scripts/texdoc/view.tlu b/Master/texmf-dist/scripts/texdoc/view.tlu
index b51bea4c570..b51bea4c570 100644
--- a/Master/texmf/scripts/texdoc/view.tlu
+++ b/Master/texmf-dist/scripts/texdoc/view.tlu
diff --git a/Master/texmf/texdoctk/texdocrc-win32.defaults b/Master/texmf-dist/texdoctk/texdocrc-win32.defaults
index d524ae99791..d524ae99791 100644
--- a/Master/texmf/texdoctk/texdocrc-win32.defaults
+++ b/Master/texmf-dist/texdoctk/texdocrc-win32.defaults
diff --git a/Master/texmf/texdoctk/texdocrc.defaults b/Master/texmf-dist/texdoctk/texdocrc.defaults
index d524ae99791..d524ae99791 100644
--- a/Master/texmf/texdoctk/texdocrc.defaults
+++ b/Master/texmf-dist/texdoctk/texdocrc.defaults
diff --git a/Master/texmf/texdoctk/texdoctk.dat b/Master/texmf-dist/texdoctk/texdoctk.dat
index b67c580f0d7..b67c580f0d7 100644
--- a/Master/texmf/texdoctk/texdoctk.dat
+++ b/Master/texmf-dist/texdoctk/texdoctk.dat
diff --git a/Master/tlpkg/tlpsrc/a2ping.tlpsrc b/Master/tlpkg/tlpsrc/a2ping.tlpsrc
index a91bbf0fe34..0dfd146fb2c 100644
--- a/Master/tlpkg/tlpsrc/a2ping.tlpsrc
+++ b/Master/tlpkg/tlpsrc/a2ping.tlpsrc
@@ -1,4 +1,4 @@
 category TLCore
 docpattern f texmf/doc/man/man1/${PKGNAME}.*
-runpattern f texmf/scripts/${PKGNAME}/${PKGNAME}.pl
+runpattern f texmf-dist/scripts/${PKGNAME}/${PKGNAME}.pl
 binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
index 1b6c85c0954..2b28fd577d0 100644
--- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
@@ -9,7 +9,7 @@ execute AddFormat name=pdfetex engine=pdftex patterns=language.def \
 runpattern f texmf/fonts/map/pdftex/updmap/*
 runpattern f texmf/tex/generic/config/pdftex*.tex
 runpattern f texmf/tex/generic/pdftex/*
-runpattern d texmf/scripts/simpdftex
+runpattern d texmf-dist/scripts/simpdftex
 docpattern f texmf/doc/man/man1/pdfetex.*
 docpattern f texmf/doc/man/man1/pdftex.*
 docpattern d texmf-dist/doc/pdftex
diff --git a/Master/tlpkg/tlpsrc/pdftools.tlpsrc b/Master/tlpkg/tlpsrc/pdftools.tlpsrc
index 0c368b356e1..f526ff4d2a5 100644
--- a/Master/tlpkg/tlpsrc/pdftools.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftools.tlpsrc
@@ -12,4 +12,4 @@ docpattern f texmf/doc/man/man1/e2pall.*
 docpattern f texmf/doc/man/man1/pdfclose.*
 docpattern f texmf/doc/man/man1/pdfopen.*
 docpattern f texmf/doc/man/man1/pdftosrc.*
-runpattern f texmf/scripts/tetex/e2pall.pl
+runpattern f texmf-dist/scripts/tetex/e2pall.pl
diff --git a/Master/tlpkg/tlpsrc/texdoc.tlpsrc b/Master/tlpkg/tlpsrc/texdoc.tlpsrc
index d57a051e062..df98dd9a79a 100644
--- a/Master/tlpkg/tlpsrc/texdoc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texdoc.tlpsrc
@@ -2,13 +2,13 @@ category TLCore
 depend kpathsea
 postaction shortcut type=menu name="TeXdoc GUI" \
            cmd="TEXDIR/bin/win32/texdoctk.exe"
-runpattern f texmf/scripts/tetex/texdoctk.pl
-runpattern f texmf/scripts/texdoc/*
-runpattern f texmf/texdoctk/*
+runpattern f texmf-dist/scripts/tetex/texdoctk.pl
+runpattern f texmf-dist/scripts/texdoc/*
+runpattern f texmf-dist/texdoctk/*
 runpattern f texmf-dist/texdoc/*
 docpattern f texmf/doc/man/man1/texdoc.*
 docpattern f texmf/doc/man/man1/texdoctk.*
-docpattern f texmf/doc/texdoc/*
+docpattern f texmf-dist/doc/texdoc/*
 binpattern f bin/${ARCH}/texdoc
 binpattern f bin/${ARCH}/texdoctk
 binpattern f bin/win32/texdocc