summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/doc/build-tools.txt4
-rw-r--r--Build/source/doc/tlbuild.info11
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm6
-rwxr-xr-xMaster/tlpkg/bin/c2lx8
4 files changed, 18 insertions, 11 deletions
diff --git a/Build/source/doc/build-tools.txt b/Build/source/doc/build-tools.txt
index 16bd6fa192d..3fde6a5901f 100644
--- a/Build/source/doc/build-tools.txt
+++ b/Build/source/doc/build-tools.txt
@@ -1,7 +1,7 @@
autoconf (GNU Autoconf) 2.69
automake (GNU automake) 1.16.1
-bison (GNU Bison) 3.3.1
+bison (GNU Bison) 3.4.2
flex 2.6.0
ltmain.sh (GNU libtool) 2.4.6
m4 (GNU M4) 1.4.18
-makeinfo (GNU texinfo) 6.6
+makeinfo (GNU texinfo) 6.7
diff --git a/Build/source/doc/tlbuild.info b/Build/source/doc/tlbuild.info
index 3b71c77562c..1e6a5dbfb13 100644
--- a/Build/source/doc/tlbuild.info
+++ b/Build/source/doc/tlbuild.info
@@ -1,4 +1,4 @@
-This is tlbuild.info, produced by makeinfo version 6.6 from
+This is tlbuild.info, produced by makeinfo version 6.7 from
tlbuild.texi.
This file documents the TeX Live build system and more.
@@ -747,11 +747,11 @@ many extra hassles, so don't do that, tempting as it may be.
autoconf (GNU Autoconf) 2.69
automake (GNU automake) 1.16.1
- bison (GNU Bison) 3.3.1
+ bison (GNU Bison) 3.4.2
flex 2.6.0
ltmain.sh (GNU libtool) 2.4.6
m4 (GNU M4) 1.4.18
- makeinfo (GNU texinfo) 6.6
+ makeinfo (GNU texinfo) 6.7
These versions should be used to update the generated files (e.g.,
'configure' or 'Makefile.in') in all or parts of the TL tree after their
@@ -5978,3 +5978,8 @@ Node: tlmgr AUTHORS AND COPYRIGHT191228
Node: Index191627

End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index ac7b6c36505..70a1deaa2f4 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -290,6 +290,10 @@ sub from_file {
}
if ($params{'media'}) {
$media = $params{'media'};
+ } elsif (! -d $rootpath) {
+ # no point in going on if we don't even have a directory.
+ tlwarn("TLPDB: not a directory, not loading: $rootpath\n");
+ return 0;
} elsif (-d "$rootpath/texmf-dist/web2c") {
$media = 'local_uncompressed';
} elsif (-d "$rootpath/texmf/web2c") { # older
@@ -300,7 +304,7 @@ sub from_file {
$media = 'local_compressed';
} else {
# we cannot find the right type, return zero, hope people notice
- tlwarn("Cannot determine type of tlpdb from $rootpath!\n");
+ tlwarn("TLPDB: Cannot determine type of tlpdb from $rootpath!\n");
return 0;
}
}
diff --git a/Master/tlpkg/bin/c2lx b/Master/tlpkg/bin/c2lx
index 5e7bed389e1..183854cde6b 100755
--- a/Master/tlpkg/bin/c2lx
+++ b/Master/tlpkg/bin/c2lx
@@ -17,17 +17,15 @@ cp /dev/null $dirsfile.tmp
cp /dev/null /tmp/first
if test "x$1" = xe; then
- shift
- label=l2e
+ shift; label=l2e
pkgs="amsmath cyrillic graphics tools latex"
# latex-tds still has knuth psnfss; babel is separate
elif test "x$1" = xdev; then
- shift
- label=ldev
+ shift; label=ldev
pkgs="latex-amsmath-dev latex-graphics-dev latex-tools-dev latex-base-dev"
# latex-tds still has knuth psnfss; babel is separate
elif test "x$1" = x3; then
- label=l3
+ shift; label=l3
pkgs="l3kernel l3packages l3experimental l3build l3backend"
else
echo "$0: unknown latex type: $1 (one of: e dev 3)" >&2