summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-11-15 00:35:53 +0000
committerKarl Berry <karl@freefriends.org>2012-11-15 00:35:53 +0000
commit3b68475005c077f0f9c2a85f34418b5c0eb9e393 (patch)
tree43e4edc2b0811f2f6282893503d4ff38898d1d6a /Master/tlpkg
parent24bdf3da6edc25056334c4063cf9c3d23ef95505 (diff)
build-aux syncs
git-svn-id: svn://tug.org/texlive/trunk@28265 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-auto5
-rw-r--r--Master/tlpkg/dev/srclist.txt14
2 files changed, 13 insertions, 6 deletions
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.