From 1aa068456162cd62d4b5345d1b39735fcd1a7ed8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 28 May 2008 18:29:28 +0000 Subject: avoid running fmtutil/updmap/etc., and avoid making dumps git-svn-id: svn://tug.org/texlive/trunk@8396 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/ChangeLog | 10 ++++ Build/source/Makefile.in | 33 +++--------- Build/source/texk/web2c/ChangeLog | 15 ++++++ Build/source/texk/web2c/Makefile.in | 83 +++++++---------------------- Build/source/texk/web2c/alephdir/aleph.mk | 29 ++-------- Build/source/texk/web2c/etexdir/etex.mk | 31 +++-------- Build/source/texk/web2c/luatexdir/luatex.mk | 19 +------ Build/source/texk/web2c/omegadir/omega.mk | 31 ++--------- Build/source/texk/web2c/pdftexdir/pdftex.mk | 29 ++-------- Build/source/texk/web2c/xetexdir/xetex.mk | 25 ++------- 10 files changed, 73 insertions(+), 232 deletions(-) (limited to 'Build') diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index 1e01bc525fd..55a641f8125 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,4 +1,14 @@ +2008-05-28 Karl Berry + + * 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. + Do not try to run fmtutil, updmap, mktexlsr, texlinks or anything else. + (world): since strip already depends on install, omit install. + Add echo's for when targets are finished. + 2008-04-07 Peter Breitenlohner + * configure.in: respect library dependencies. 2008-03-25 Karl Berry diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index 6df2167f442..d5988807385 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -60,35 +60,14 @@ install: all (cd $$dir && PATH=$(scriptdir):$(bindir):$(PATH) \ $(MAKE) $@) || exit 1; \ done - if test -d $(texmf) && test -f $(srcdir)/release-tetex-src.txt; then \ - $(INSTALL_DATA) $(srcdir)/release-tetex-src.txt $(texmf); \ - fi @FMU@ @FMU@install-extra: -# temporary fix for missing links - - if test -f texk/web2c/omegafonts/omfonts; then \ - cd texk/web2c/omegafonts && $(MAKE) install-links; \ - else :; fi $(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c" - - if test -f $(scriptdir)/mktexlsr; then \ - TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ - $(scriptdir)/mktexlsr; \ - else :; fi - - if test -f $(scriptdir)/fmtutil-sys; then \ - TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ - $(scriptdir)/fmtutil-sys --all; \ - else :; fi - if test -f $(scriptdir)/texlinks; then \ + echo "$@: running texlinks (install-extra)"; \ TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ $(scriptdir)/texlinks; \ else :; fi - - if test -f $(scriptdir)/updmap-sys \ - && TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ - $(scriptdir)/kpsewhich --format='web2c files' updmap.cfg >/dev/null; \ - then \ - TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ - $(scriptdir)/updmap-sys; \ - else :; fi install-exec: for dir in $(INSTDIRS); do \ @@ -98,11 +77,8 @@ install-exec: done @FMU@ @FMU@install-exec-extra: -# temporary fix for missing links - - if test -f texk/web2c/omegafonts/omfonts; then \ - cd texk/web2c/omegafonts && $(MAKE) install-links; \ - else :; fi - if test -f $(scriptdir)/texlinks; then \ + echo "$@: running texlinks (install-exec-extra)"; \ TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \ $(scriptdir)/texlinks; \ else :; fi @@ -128,6 +104,7 @@ all clean mostlyclean: echo making $@ in $$dir; \ (if test -f $$dir/Makefile; then cd $$dir && $(MAKE) $@; else true; fi) || exit 1; \ done + @echo "make $@ done." # to build libraries only, when working on drivers. lib: @LIBSDEP@ @@ -148,7 +125,9 @@ tags TAGS: realclean: distclean -world: install strip +world: strip + @echo "make $@ done." + pdftex pdfetex: cd texk/web2c; $(MAKE) $@ test -f texk/web2c/pdftex && ls -l texk/web2c/pdftex diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 813d8a593fd..23317f1aeaf 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,18 @@ +2008-05-28 Karl Berry + + * Makefile.in (basic_engines): split off tex/mf[n]/mpost. + (install-programs): handle basic_engines here. + (install-tex, install-mf, install-mpost; -exec, -data, -dumps): + remove all these. Never try to make the dumps. + * luatexdir/luatex.mk, + * omegadir/omega.mk, + * xetexdir/xetex.mk, + * alephdir/aleph.mk, + * pdftexdir/pdftex.mk, + * etex/etex.mk: omit installation of pool files and dumps, + with consequent simplifications. For etex.mk, also omit + installation of the binary. + 2008-05-25 Karl Berry * cpascal.h (loadpoolstrings): declare. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 3e97d278405..a8ac7643eab 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -9,9 +9,8 @@ version = @WEB2CVERSION@ .NOTPARALLEL: # These lines define the memory dumps that fmts/bases/mems will make and -# install-fmts/install-bases/install-mems will install. plain.* is -# created automatically (as a link). See the Formats node in -# doc/web2c.texi for details on the fmts. +# install-fmts/install-bases/install-mems will install. +# See the Formats node in doc/web2c.texi for more details. fmts = olatex.fmt # amstex.fmt eplain.fmt texinfo.fmt efmts = latex.fmt pdffmts = pdfolatex.fmt @@ -19,7 +18,7 @@ pdfefmts = pdflatex.fmt afmts = lamed.fmt ofmts = lambda.fmt eofmts = elambda.fmt -bases = # I do not recommend building cmmf.base. +bases = # no good reason to build cmmf.base. mems = # mfplain.mem is probably not generally useful. # The name of the file that defines your local devices for Metafont. @@ -599,9 +598,14 @@ programs = bibtex ctangle ctie cweave dvicopy dvitomp dvitype gftodvi gftopk \ pktogf pktype pltotf pooltype synctex tangle tftopl tie $(ttf2afm) \ vftovp vptovf weave +# basic_engines are the binaries we build and install directly here in +# the webdir/ directory. # include $(metapost) from metapost.mk even though it also includes # dvitomp. Hopefully that doesn't hurt. -engines = $(tex) $(etex) $(mf) $(mfn) $(metapost) \ +basic_engines = $(tex) $(mf) $(mfn) $(metapost) + +# engines includes the ones built in subdirectories. +engines = $(basic_engines) $(etex) \ $(omega) $(aleph) \ $(pdftex) $(pdfetex) \ $(xetex) $(luatex) @@ -765,10 +769,6 @@ tex.fmt: tex $(dumpenv) $(MAKE) progname=tex files="plain.tex cmr10.tfm" prereq-check $(dumpenv) ./tex --progname=tex --jobname=tex --ini \\input plain \\dump