From 605965503bda0cf0120b0139ca5e3478f80eaf4f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 22 May 2008 23:21:52 +0000 Subject: do not generate now-unused fmtutil.cnf git-svn-id: svn://tug.org/texlive/trunk@8296 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm/ChangeLog | 5 +++++ Build/source/texk/web2c/ChangeLog | 7 +++++++ Build/source/texk/web2c/Makefile.in | 2 -- Build/source/texk/web2c/configure | 3 --- Build/source/texk/web2c/configure.in | 1 - Build/source/texk/web2c/fmtutil.in | 19 ++++++++++--------- Build/source/texk/web2c/stamp-aclocal | 2 +- Build/source/texk/web2c/stamp-auto.in | 2 +- Build/source/texk/web2c/stamp-configure | 2 +- 9 files changed, 25 insertions(+), 18 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvipdfm/ChangeLog b/Build/source/texk/dvipdfm/ChangeLog index c67fc2301bf..5a9769a9363 100644 --- a/Build/source/texk/dvipdfm/ChangeLog +++ b/Build/source/texk/dvipdfm/ChangeLog @@ -1,3 +1,8 @@ +2008-05-23 Karl Berry + + * Makefile.in (install-exec): no longer install ebb, since + dvipdfmx can serve as a compatible replacement. + 2008-02-29 Peter Breitenlohner The Makefile.in uses `kpse_include ../make/config.mk'; thus diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 59d69403a09..f049a614fc1 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,10 @@ +2008-05-23 Karl Berry + + * configure.in (fmtutil.cnf): no longer generate from fmtutil.in. + * Makefile.in (install, distclean): remove lines about fmtutil.cnf. + * fmtutil.in: note that this file is no longer used, the real + fmtutil.cnf is now generated at install time. + 2008-05-20 Karl Berry (Found by peb.) diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 75c603e718d..44b27c6b3f5 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -927,7 +927,6 @@ install-data:: $(web2cdir) cd man && $(MAKE) $(install_makeargs) install-data $(INSTALL_DATA) $(srcdir)/tiedir/tie.1 $(man1dir)/tie.$(manext) $(INSTALL_DATA) $(srcdir)/ctiedir/ctie.1 $(man1dir)/ctie.$(manext) - $(INSTALL_DATA) fmtutil.cnf $(web2cdir)/fmtutil.cnf # Dummy target. uninstall uninstall-exec uninstall-data: @@ -1168,7 +1167,6 @@ clean:: distclean:: test ! -r lib/Makefile \ || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done - rm -f fmtutil.cnf extraclean:: test ! -r lib/Makefile \ || for d in $(all_subdirs); do (cd $$d && $(MAKE) $@); done diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 0d4ab1725dd..6b552463e96 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -11115,8 +11115,6 @@ ac_config_files="$ac_config_files web2c/Makefile:web2c/Makefile.aux" ac_config_files="$ac_config_files window/Makefile.aux:window/Makefile.in" ac_config_files="$ac_config_files window/Makefile:window/Makefile.aux" -ac_config_files="$ac_config_files fmtutil.cnf:fmtutil.in" - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -11726,7 +11724,6 @@ do "web2c/Makefile") CONFIG_FILES="$CONFIG_FILES web2c/Makefile:web2c/Makefile.aux" ;; "window/Makefile.aux") CONFIG_FILES="$CONFIG_FILES window/Makefile.aux:window/Makefile.in" ;; "window/Makefile") CONFIG_FILES="$CONFIG_FILES window/Makefile:window/Makefile.aux" ;; - "fmtutil.cnf") CONFIG_FILES="$CONFIG_FILES fmtutil.cnf:fmtutil.in" ;; *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 $as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/Build/source/texk/web2c/configure.in b/Build/source/texk/web2c/configure.in index 15515751596..7abfd68c0d1 100644 --- a/Build/source/texk/web2c/configure.in +++ b/Build/source/texk/web2c/configure.in @@ -486,5 +486,4 @@ AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */]) dnl Generate `Makefile's, `config.status', and our header file. KPSE_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile mpware/Makefile mpdir/Makefile web2c/Makefile window/Makefile]) -AC_CONFIG_FILES([fmtutil.cnf:fmtutil.in]) AC_OUTPUT diff --git a/Build/source/texk/web2c/fmtutil.in b/Build/source/texk/web2c/fmtutil.in index 1a35ce8eab9..27215dcd4f5 100644 --- a/Build/source/texk/web2c/fmtutil.in +++ b/Build/source/texk/web2c/fmtutil.in @@ -1,11 +1,16 @@ # Originally written by Thomas Esser, 1998. Public domain. # fmtutil.cnf: configuration file for fmtutil. # -# This TeX Live fmtutil.cnf is not kept exactly in sync with the teTeX -# fmtutil.cnf (and not maintained by te), since the two distributions -# need different settings, although they are nearly the same. The TL -# version has a few extra entries at the end, mainly. - +# This fmtutil.in file is not used by TeX Live (or teTeX) at all. +# It used to generate a fmtutil.cnf file in the TL source tree, which +# was (manually) kept in sync with TL's Master/texmf/web2c/fmtutil.cnf +# file. But now, the TL installer creates the fmtutil file based on the +# packages chosen, via the `BuildFormat' directives in tlpdb (coming +# directly from the *.tlpsrc files). +# +# This fmtutil.in remains in the TL source tree for now just for +# comparison/archival. +# # Customize this file to your needs, e.g. # - remove or uncomment formats that you don't need # - add your own formats @@ -79,10 +84,6 @@ amstex pdftex - -translate-file=cp227.tcx *amstex.ini #! cont-nl xetex cont-usr.tex -8bit *cont-nl.ini #! cont-uk pdftex cont-usr.tex -8bit *cont-uk.ini #! cont-uk xetex cont-usr.tex -8bit *cont-uk.ini -# -# mptopdf utility -mptopdf pdftex - -translate-file=cp227.tcx mptopdf.tex -metafun mpost - -translate-file=cp227.tcx metafun.mp # language-specific things: diff --git a/Build/source/texk/web2c/stamp-aclocal b/Build/source/texk/web2c/stamp-aclocal index dd74b4dd662..5f59f8a68a3 100644 --- a/Build/source/texk/web2c/stamp-aclocal +++ b/Build/source/texk/web2c/stamp-aclocal @@ -1 +1 @@ -Thu Apr 10 20:21:40 CEST 2008 +Fri May 23 01:15:42 CEST 2008 diff --git a/Build/source/texk/web2c/stamp-auto.in b/Build/source/texk/web2c/stamp-auto.in index fa6692b81b2..a2f9e90a795 100644 --- a/Build/source/texk/web2c/stamp-auto.in +++ b/Build/source/texk/web2c/stamp-auto.in @@ -1 +1 @@ -Thu Apr 10 20:21:42 CEST 2008 +Fri May 23 01:15:44 CEST 2008 diff --git a/Build/source/texk/web2c/stamp-configure b/Build/source/texk/web2c/stamp-configure index 23a550f5cb3..7f3a9bd6f90 100644 --- a/Build/source/texk/web2c/stamp-configure +++ b/Build/source/texk/web2c/stamp-configure @@ -1 +1 @@ -Tue May 13 14:40:09 CEST 2008 +Fri May 23 01:15:45 CEST 2008 -- cgit v1.2.3