build-aux syncs

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

4 files changed, 29 insertions, 15 deletions

diff --git a/Build/source/build-aux/README.TL b/Build/source/build-aux/README.TL
index 4671045f6dd..a80373e5bb5 100644
--- a/Build/source/build-aux/README.TL
+++ b/Build/source/build-aux/README.TL
@@ -1,11 +1,20 @@
-Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+Copyright (C) 2009, 2012 Peter Breitenlohner <tex-live@tug.org>
 You may freely use, modify and/or distribute this file.
 
 This directory is the central repository for auxiliary files, mostly
 shell scripts, needed to build the TeX Live (TL) tree.  They are used by
 all packages `owned' by the TL tree, i.e., maintained as part of TL.
 
-All these files are maintained elsewhere and are available from the
-GNU gnulib project (http://savannah.gnu.org/projects/gnulib).  The
-script Master/tlpkg/bin/tl-update-auto attempts to keep them up to date,
-except when the sources are frozen.
+ylwrap and missing come from automake; ltmain.sh comes from libtool.
+Those must be manually updated when new versions of the packages are
+installed.  The Master/tlpkg/dev/srclist.txt file has checks for these,
+but updates are not automatic.  (We generally try to use the latest
+official release, as it is available directly from GNU, not any distro
+version.)
+
+relpath is locally written.
+
+The rest of these files are maintained elsewhere and are available from
+the GNU gnulib project (http://savannah.gnu.org/projects/gnulib).  The
+script Master/tlpkg/bin/tl-update-auto attempts to keep those up to date
+(except when the TL sources are frozen).
diff --git a/Build/source/build-aux/missing b/Build/source/build-aux/missing
index 074c62c4488..9a5564823de 100755
--- a/Build/source/build-aux/missing
+++ b/Build/source/build-aux/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2012-05-23.18; # UTC
+scriptversion=2012-01-06.18; # UTC
 
 # Copyright (C) 1996-2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@@ -160,9 +160,7 @@ WARNING: '$1' is $msg.  You should only need it if
          you modified 'acconfig.h' or '${configure_ac}'.  You might want
          to install the Autoconf and GNU m4 packages.  Grab them
          from any GNU archive site."
-    files=`sed -n -e 's/^[ ]*AC_CONFIG_HEADER(\([^)]*\)).*/\1/p' \
-                  -e 's/^[ ]*AC_CONFIG_HEADERS(\([^)]*\)).*/\1/p' \
-             ${configure_ac}`
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index f4259274366..c4c15205dd5 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -126,8 +126,7 @@ fi # !config_scripts_only
 
 
 #  config.guess/sub/etc. from elsewhere on tug.org, mirrored from GNU.
-# ylwrap comes from automake; ltmain.sh comes from libtool.  For those
-# two, have to manually remember to update when new versions are installed.
+# See Build/source/build-aux/README.TL for more info on common scripts.
 # 
 config_masterdir=/home/ftp/dist/build-aux
 #
@@ -142,7 +141,7 @@ for gnuconf in config.guess config.sub depcomp install-sh texinfo.tex; do
   #
   if $diff $local_conffile $master_conffile >$temp.$gnuconf.diff; then
     $verbose "  $gnuconf ok."
-    rm -f $temp
+    rm -f $temp.$gnuconf.diff
   else
     # updated needed. find all copies in source.
     # Build/source/utils/asymptote/gc* is not checked in (since it's not
diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt
index e26e53a4e5e..45d7564d799 100644
--- a/Master/tlpkg/dev/srclist.txt
+++ b/Master/tlpkg/dev/srclist.txt
@@ -17,19 +17,27 @@
 ##(until needed) Master/texmf/web2c/texmf.cnf  Build/source/texk/kpathsea/
 Master/texmf/web2c/fmtutil.cnf Build/source/texk/tetex/
 #
-# Platform detection for biber and tests
+# Platform detection for biber and tests:
 Master/tlpkg/TeXLive/TLUtils.pm  Build/source/utils/biber/TeXLive/
 Master/tlpkg/TeXLive/TLConfig.pm Build/source/utils/biber/TeXLive/
 #
 Master/tlpkg/TeXLive/TLUtils.pm  Build/source/texk/tests/TeXLive/
 Master/tlpkg/TeXLive/TLConfig.pm Build/source/texk/tests/TeXLive/
 #
-# used by pdftex, now maintained in lcdf-typetools.
-Build/source/texk/lcdf-typetools/glyphtounicode.tex Master/texmf/tex/generic/pdftex/glyphtounicode.tex
+# used by pdftex, now maintained in lcdf-typetools:
+Build/source/texk/lcdf-typetools/lcdf-typetools-*/glyphtounicode.tex Master/texmf/tex/generic/pdftex/glyphtounicode.tex
 #
 # should be committed at the same time due to Id expansion, seems preferable?
 Build/source/texk/texlive/w32_wrapper/runscript.tlu Master/bin/win32/runscript.tlu
 #
+# scripts from GNU packages (locally) installed on the system;
+# see Build/source/build-aux/README.TL.  The version number embedded in
+# the automake path is unfortunate, but automake provides no
+# version-independent access.
+/usr/local/gnu/share/libtool/config/ltmain.sh Build/source/build-aux/ltmain.sh
+/usr/local/gnu/share/automake-1.12/missing Build/source/build-aux/missing
+/usr/local/gnu/share/automake-1.12/ylwrap Build/source/build-aux/ylwrap
+#
 ##todo: linked_scripts
 ##
 ##todo: ConTeXt in TL is in flux again.