summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-05-28 22:19:34 +0000
committerKarl Berry <karl@freefriends.org>2008-05-28 22:19:34 +0000
commit5bbaf06f384f3df4641f90e92dc8a9ea76ba39b4 (patch)
treea78dc7ed197f5403d1c4da03593dd4d9bba5be75
parent1aa068456162cd62d4b5345d1b39735fcd1a7ed8 (diff)
run texlinks after all else is installed
git-svn-id: svn://tug.org/texlive/trunk@8399 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/ChangeLog3
-rw-r--r--Build/source/Makefile.in49
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rwxr-xr-xBuild/source/texk/kpathsea/mktexlsr30
-rw-r--r--Build/source/texk/tetex/ChangeLog8
-rw-r--r--Build/source/texk/tetex/Makefile.in12
-rw-r--r--Build/source/texk/tetex/fmtutil.cnf105
-rwxr-xr-xBuild/source/texk/tetex/texlinks12
8 files changed, 171 insertions, 52 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index 55a641f8125..f7f8182c3d4 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,5 +1,8 @@
2008-05-28 Karl Berry <karl@tug.org>
+ * Makefile.in (world): invoke new run-texlinks target
+ in texk/tetex.
+
* Makefile.in (install-extra): do not go to omfonts, the omega.mk
targets take care of that.
Do not try to install release-tetex-src.txt.
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index d5988807385..2db0f316a68 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -54,34 +54,18 @@ LIBSDIRS = @LIBSDIRS@
INSTDIRS = @INSTDIRS@
default: all
-install: all
+install install-exec install-data uninstall: all
for dir in $(INSTDIRS); do \
- echo making $@ in $$dir; \
- (cd $$dir && PATH=$(scriptdir):$(bindir):$(PATH) \
- $(MAKE) $@) || exit 1; \
- done
-@FMU@
-@FMU@install-extra:
- $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
- - if test -f $(scriptdir)/texlinks; then \
- echo "$@: running texlinks (install-extra)"; \
- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/texlinks; \
- else :; fi
-
-install-exec:
- for dir in $(INSTDIRS); do \
- echo making $@ in $$dir; \
- (cd $$dir && PATH=$(scriptdir):$(bindir):$(PATH) \
- $(MAKE) $@) || exit 1; \
+ echo making $@ in $$dir; \
+ (cd $$dir && $(MAKE) $@) || exit 1; \
done
-@FMU@
-@FMU@install-exec-extra:
- - if test -f $(scriptdir)/texlinks; then \
- echo "$@: running texlinks (install-exec-extra)"; \
- TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
- $(scriptdir)/texlinks; \
- else :; fi
+# only do this at make install, because the binaries won't be there with
+# just install-data, and fmtutil.cnf won't be there with just install-exec.
+ if test "$@" = install; then \
+ echo "top-level make $@: running selfautofix and texlinks ..."; \
+ $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"; \
+ cd texk/tetex && $(MAKE) run-texlinks; \
+ fi
strip: install
cd $(bindir) && strip * >/dev/null 2>&1 || true
@@ -89,12 +73,6 @@ strip: install
check:
cd texk; TEXMF='{$(texmf),$(texmf)-dist}' TEXMFCNF=$(texmf)/web2c $(MAKE) $@
-uninstall:
- for dir in $(INSTDIRS); do \
- echo making $@ in $$dir; \
- (cd $$dir && $(MAKE) $@) || exit 1; \
- done
-
Makefile: Makefile.in config.status
$(SHELL) ./config.status
@@ -118,18 +96,19 @@ distclean: clean
rm -f Makefile *.status *.cache *.log dialogconfig.h TAGS
rm -f libs/config.log libs/config.status libs/config.cache
rm -f utils/texinfo/info/funs.h utils/texinfo/info/doc.c utils/texinfo/info/key.c
+realclean: distclean
tags TAGS:
rm -f TAGS
find . -name '*.[ch]' -print | xargs etags --append -o TAGS
-
-realclean: distclean
+#
+# This is the default target for the Build script in TeX Live.
world: strip
@echo "make $@ done."
pdftex pdfetex:
- cd texk/web2c; $(MAKE) $@
+ cd texk/web2c && $(MAKE) $@
test -f texk/web2c/pdftex && ls -l texk/web2c/pdftex
test -f texk/web2c/pdfetex && ls -l texk/web2c/pdfetex
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index b7f3f572ea5..de07cb926c2 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-28 Karl Berry <karl@tug.org>
+
+ * mktexlsr: support --quiet/--silent.
+
2008-05-24 Karl Berry <karl@tug.org>
* kpathsea.texi (Specially-recognized files): new node to
diff --git a/Build/source/texk/kpathsea/mktexlsr b/Build/source/texk/kpathsea/mktexlsr
index 5546321f271..c383b79c92c 100755
--- a/Build/source/texk/kpathsea/mktexlsr
+++ b/Build/source/texk/kpathsea/mktexlsr
@@ -17,8 +17,9 @@ version='$Id$'
progname=`echo $0 | sed 's%.*/%%'`
usage="Usage: $progname [DIR]...
-Only options are --help, --version, and --verbose. If standard input is
-a terminal, --verbose is on by default.
+The only options are --help, --version, --verbose, --quiet, and --silent.
+If standard input is a terminal, --verbose is on by default.
+--quiet and --silent are synonyms, and cancel --verbose.
Rebuild all necessary ls-R filename databases completely. If one or
more arguments DIRS are given, these are used as texmf directories to
@@ -55,17 +56,22 @@ if tty -s; then verbose=true; else verbose=false; fi
# A copy of some stuff from mktex.opt, so we can run in the presence of
# terminally damaged ls-R files.
-if test "x$1" = x--help || test "x$1" = x-help; then
- echo "$usage"
- exit 0
-elif test "x$1" = x--version || test "x$1" = x-version; then
- echo "`basename $0` $version"
- kpsewhich --version
- exit 0
-elif test "x$1" = x--verbose || test "x$1" = x-verbose; then
- verbose=true
+while test $# -gt 0; do
+ if test "x$1" = x--help || test "x$1" = x-help; then
+ echo "$usage"
+ exit 0
+ elif test "x$1" = x--version || test "x$1" = x-version; then
+ echo "`basename $0` $version"
+ kpsewhich --version
+ exit 0
+ elif test "x$1" = x--verbose || test "x$1" = x-verbose; then
+ verbose=true
+ elif test "x$1" = x--quiet || test "x$1" = x--silent \
+ || test "x$1" = x-quiet || test "x$1" = x-silent ; then
+ verbose=false
+ fi
shift
-fi
+done
# mktexupd and mktexlsr make sure they're coordinated via this. A copy
# is found mktex.opt.
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index f06df2cbbae..6b45cf326b6 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-28 Karl Berry <karl@tug.org>
+
+ * fmtutil.cnf: new file, a slave of Master/texmf/web2c/fmtutil.cnf,
+ which we keep in sync via TL infrastructure scripts.
+ * Makefile.in (install-data): install fmtutil.cnf.
+ (run-texlinks): new target, invoked by top-level make.
+ * texlinks: doc fixes.
+
2008-05-19 Karl Berry <karl@tug.org>
* texdoc: remove, master is now the lua version in texmf/scripts.
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index ed2812e946a..179beb6c4a3 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -82,6 +82,7 @@ install-data::
$(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic $(texmf)/texconfig
$(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr
$(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map
+ $(INSTALL_DATA) $(srcdir)/fmtutil.cnf $(texmf)/web2c/fmtutil.cnf
install-exec:
-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
@@ -98,6 +99,17 @@ install-exec:
ln -s mktexlsr texhash
cd $(scriptdir) && rm -f mktexfmt; ln -s fmtutil mktexfmt
+#
+# This target is invoked by the top-level make,
+# to create the per-format engine symlinks in $(bindir),
+# after everything else is installed.
+# We have to create the ls-R file for kpsewhich (invoked by texlinks)
+# to find fmtutil.cnf.
+run_mktexlsr = (cd $(texmf)/web2c && $(bindir)/mktexlsr --quiet .)
+run_texlinks = $(bindir)/texlinks
+run-texlinks:
+ PATH=$(bindir):$(PATH); $(run_mktexlsr); $(run_texlinks)
+
kpse_include ../make/clean.mk
config.status: $(srcdir)/configure
diff --git a/Build/source/texk/tetex/fmtutil.cnf b/Build/source/texk/tetex/fmtutil.cnf
new file mode 100644
index 00000000000..4bf305a40f6
--- /dev/null
+++ b/Build/source/texk/tetex/fmtutil.cnf
@@ -0,0 +1,105 @@
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Wed May 21 09:15:49 2008
+# $Id: fmtutil-hdr.cnf 8068 2008-05-11 21:59:07Z karl $
+# Originally written by Thomas Esser, 1998. Public domain.
+
+# You can customize this file to your needs, e.g.
+# - remove or uncomment formats that you don't need
+# - add your own formats
+# - change default engine / flags for standard formats
+# but as of TeX Live 2008, the final fmtutil.cnf is generated by
+# texconfig generate fmtutil. You can use
+# texconfig generate fmtutil -local /some/file to make local additions.
+
+# Some notes:
+# 1) tex and amstex just load hyphen.tex. No customization.
+# You can have your own customized (via babel's hyphen.cfg)
+# formats on top of plain by using "bplain.tex" instead of
+# plain.tex (see e.g. bplain.ini file for bplain format).
+#
+# 2) etex loads language.def, not language.dat.
+#
+# 3) The symbolic link to the right engines (e.g. bplain -> tex)
+# will be generated by the "texlinks" script. So, if you call
+# fmtutil "by hand" and not via texconfig, please also call
+# texlinks afterwards.
+#
+# 4) usual comments start with "# ", whereas disabled configurations
+# start with "#! " in this file.
+
+# The format of the table is:
+
+# format engine pattern-file arguments
+
+# The last part of "arguments" must be the name of the file to run
+# initex (or another ini-engine) on. For historical reasons, that
+# filename may be preceded by a *, which is ignored.
+#
+# -ini is always passed to the engine by fmtutil.
+#
+# If no pattern-file is desired here, just use -.
+
+# formats for mltex extension:
+mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini
+mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini
+jadetex pdftex language.dat &latex jadetex.ini
+pdfjadetex pdftex language.dat &pdflatex pdfjadetex.ini
+physe pdftex - physe.ini
+#! cyrtexinfo pdftex language.dat -translate-file=cp227.tcx *cyrtxinf.ini
+# ----------------------------------------------------------------------
+# $Id$
+etex pdftex language.def -translate-file=cp227.tcx *pdftex.ini
+pdftex pdftex - -translate-file=cp227.tcx *pdftex.ini
+pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
+pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
+# Change "amstex.ini -> bamstex.ini" and "- -> language.dat"
+# if you want babel support in amstex:
+amstex pdftex - -translate-file=cp227.tcx *amstex.ini
+# Change "pdfamstex.ini -> pdfbamstex.ini" and "- -> language.dat"
+# if you want babel support in pdfamstex:
+#! pdfamstex pdftex - -translate-file=cp227.tcx *pdfamstex.ini
+csplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
+pdfcsplain pdftex - -etex -translate-file=cp227.tcx csplain.ini
+omega omega - omega.ini
+lambda omega language.dat lambda.ini
+# ------------------------------------------------------------------
+# $Id: format.context.cnf 8257 2008-05-20 21:05:08Z karl $
+#! cont-cz pdftex cont-usr.tex -8bit *cont-cz.ini
+#! cont-de pdftex cont-usr.tex -8bit *cont-de.ini
+cont-en pdftex cont-usr.tex -8bit *cont-en.ini
+#! cont-en xetex cont-usr.tex -8bit *cont-en.ini
+#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.ini
+#! cont-uk pdftex cont-usr.tex -8bit *cont-uk.ini
+#
+# mptopdf utility, which needs metafun.
+mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex
+metafun mpost - -translate-file=cp227.tcx metafun.mp
+#
+# Change "tex.ini -> bplain.ini" and "- -> language.dat"
+# if you want babel support in tex. Add -translate-file=cp227.tcx before
+# tex.ini if you want to make all characters directly "printable" for
+# any \write (instead of ^^xy).
+tex tex - tex.ini
+xmltex pdftex language.dat &latex xmltex.ini
+pdfxmltex pdftex language.dat &pdflatex pdfxmltex.ini
+mpost mpost - -translate-file=cp227.tcx mpost.mp
+mex pdftex mexconf.tex -translate-file=cp227.tcx *mex.ini
+pdfmex pdftex mexconf.tex -translate-file=cp227.tcx *pdfmex.ini
+# Change "eplain.ini -> ebplain.ini" and "- -> language.dat"
+# if you want babel support in eplain:
+eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
+aleph aleph - *aleph.ini
+lamed aleph language.dat *lambda.ini
+mf mf-nowin - -translate-file=cp227.tcx mf.ini
+#! cyramstex pdftex language.dat -translate-file=cp227.tcx *cyramstx.ini
+utf8mex pdftex mexconf.tex -enc *utf8mex.ini
+#! cyrtex pdftex language.dat -translate-file=cp227.tcx *cyrtex.ini
+# ----------------------------------------------------------------------
+# $Id: format.xetex.cnf 8068 2008-05-11 21:59:07Z karl $
+# XeTeX-based formats.
+xetex xetex language.def -etex xetex.ini
+xelatex xetex language.dat -etex xelatex.ini
+phyzzx pdftex - physe.ini
+cslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
+pdfcslatex pdftex - -etex -translate-file=cp227.tcx cslatex.ini
+texsis pdftex - -translate-file=cp227.tcx texsis.ini
diff --git a/Build/source/texk/tetex/texlinks b/Build/source/texk/tetex/texlinks
index bfe1b75db16..48657905634 100755
--- a/Build/source/texk/tetex/texlinks
+++ b/Build/source/texk/tetex/texlinks
@@ -6,6 +6,7 @@
# the lines given in fmtutil.cnf.
# History:
+# (Further changes in ChangeLog.)
# Tue Oct 9 14:23:01 BST 2007
# Added unlink option (-u) to aid OpenBSD package uninstall
# Edd Barrett <vext01@gmail.com>
@@ -13,7 +14,7 @@
# remove special cases for csplain,cslatex,pdfcslatex,pdfcsplain
# Fr Apr 8 19:15:05 CEST 2005
# cleanup now has an argument for the return code
-# So Mär 27 18:52:06 CEST 2005
+# So Mar 27 18:52:06 CEST 2005
# honor $TMPDIR, $TEMP and $TMP, not just $TMP
# Mon May 10 20:52:48 CEST 2004
# kpseaccess instead of access
@@ -38,8 +39,7 @@ export PATH
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
cnf=fmtutil.cnf # name of the config file
-version=1192147136 # seconds since `00:00:00 1970-01-01 UTC'
- # date '+%s' (with GNU date)
+version=20080528.1847 # utc timestamp
progname=texlinks
usage='Usage: texlinks [OPTION]... [DIRECTORY]...
@@ -58,8 +58,9 @@ Mandatory arguments to long options are mandatory for short options too.
-u, --unlink remove symlinks created by texlinks
The DIRECTORY arguments are an optional list of directories in which to
-operate. If no directories are specified the list of directories
-depends on the --multiplatform option.
+operate. If no directories are specified and --multiplatform is
+likewise not specified, the directory of this script itself is used.
+With --multiplatform, all child dirs of an upper-level bin/ dir are used.
Report bugs to tex-k@tug.org.'
@@ -149,6 +150,7 @@ install_link()
case $src in
*/cont-??|*/metafun|*/mptopdf)
+ # context includes wrapper scripts that create/run these.
verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
;;
*)