summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/Build5
-rwxr-xr-xBuild/source/reautoconf12
-rw-r--r--Master/tlpkg/etc/tlnet-disabled-packages.txt18
3 files changed, 11 insertions, 24 deletions
diff --git a/Build/source/Build b/Build/source/Build
index a394c0ba49f..27efea93f00 100755
--- a/Build/source/Build
+++ b/Build/source/Build
@@ -8,9 +8,8 @@
# overridden with environment variables.
# clean up environment
-unset TEXMFCNF
-export TEXMFCNF
-LANG=C
+unset TEXMFCNF; export TEXMFCNF
+LANG=C; export LANG
# cd to our source directory.
mydir=`dirname $0`
diff --git a/Build/source/reautoconf b/Build/source/reautoconf
index f8b8663cf16..fe42f51fc08 100755
--- a/Build/source/reautoconf
+++ b/Build/source/reautoconf
@@ -1,5 +1,4 @@
#! /bin/sh
-
# $Id$
# This "reautoconf" script found at the root of the TeX Live source tree
# runs aclocal and autoconf (from PATH) in all relevant directories.
@@ -82,13 +81,13 @@ done
: ${TL_ACLOCAL=aclocal}
echo "$0: using \"$TL_ACLOCAL\" = `$TL_ACLOCAL --version | sed 1q`"
-echo "$0: if you want to use a different aclocal, set TL_ACLOCAL."
+echo "$0: if you want to use a different aclocal, set TL_ACLOCAL."
: ${TL_AUTOCONF=autoconf}
echo "$0: using \"$TL_AUTOCONF\" = `$TL_AUTOCONF --version | sed 1q`"
-echo "$0: if you want to use a different autoconf, set TL_AUTOCONF."
+echo "$0: if you want to use a different autoconf, set TL_AUTOCONF."
: ${TL_AUTOHEADER=autoheader}
echo "$0: using \"$TL_AUTOHEADER\" = `$TL_AUTOHEADER --version | sed 1q`"
-echo "$0: if you want to use a different autoheader, set TL_AUTOHEADER."
+echo "$0: if you want to use a different autoheader, set TL_AUTOHEADER."
# Give users a chance to quit here
# and set TL_ACLOCAL, TL_AUTOCONF and/or TL_AUTOHEADER
@@ -129,7 +128,10 @@ fi
# Autoconf in all directories
for dir in $list; do
- if test -f "$dir/configure.in"; then
+ if test ! -d "$dir"; then
+ echo "$0: $dir not a directory, skipping." >&2
+ continue
+ elif test -f "$dir/configure.in"; then
base=configure.in
elif test -f "$dir/configure.ac"; then
base=configure.ac
diff --git a/Master/tlpkg/etc/tlnet-disabled-packages.txt b/Master/tlpkg/etc/tlnet-disabled-packages.txt
index c1a95ad94fb..479bc6f25b5 100644
--- a/Master/tlpkg/etc/tlnet-disabled-packages.txt
+++ b/Master/tlpkg/etc/tlnet-disabled-packages.txt
@@ -1,16 +1,2 @@
-tex4ht
-tex4ht.alpha-linux
-tex4ht.amd64-freebsd
-tex4ht.hppa-hpux
-tex4ht.i386-freebsd
-tex4ht.i386-linux
-tex4ht.i386-openbsd
-tex4ht.i386-solaris
-tex4ht.mips-irix
-tex4ht.powerpc-aix
-tex4ht.powerpc-linux
-tex4ht.sparc-linux
-tex4ht.sparc-solaris
-tex4ht.universal-darwin
-tex4ht.win32
-tex4ht.x86_64-linux
+# this file specifies (non-critical) packages which should not be
+# updated on tlnet for whatever reason. It's used by tl-update-containers.