remove texmf.in, just use slave copy of texmf.cnf; consequently simplify paths.h generation

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

9 files changed, 104 insertions, 136 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index de07cb926c2..ab8a15ec0d6 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,17 @@
+2008-05-29  Karl Berry  <karl@tug.org>
+
+	* db.c (DB_HASH_SIZE): increase to 75000+, the actual size of
+	current ls-R.
+
+	* cnf.c: doc fixes.
+
+	* Makefile.in (stamp-paths): change var substitutions to use /nonesuch.
+	(texmf.sed, texmf.cnf): remove targets, we will juse use texmf.cnf.
+	(install-data): texmf.cnf is in srcdir now.
+
+	* texmf.in: remove.
+	* texmf.cnf: new file, slave to Master/texmf/web2c/texmf.cnf.
+
 2008-05-28  Karl Berry  <karl@tug.org>
 
 	* mktexlsr: support --quiet/--silent.
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index bf86b4c4211..9a46993995e 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -57,43 +57,6 @@ kpsereadlink: readlink.o
 $(kpathsea): $(objects)
 	$(kpathsea_link) -rpath $(libdir) -version-info @KPSE_LT_VERS@ $(objects)
 
-# Make variable substitutions for paths.h.
-texmf.cnf: texmf.in texmf.sed
-	sed -f texmf.sed $(srcdir)/texmf.in >$@
-
-# The idea is to turn each var=value into s%@var@%value%g. Seems simpler
-# to put the substitutions in a file than to play shell quoting games.
-texmf.sed: Makefile
-	rm -f texmf.sed
-	echo $(makevars) \
-	| tr ' ' '\012' \
-	| sed -e 's/^/s%@/' -e 's/=/@%/' -e 's/$$/%g/' \
-	>$@
-# Insert $TEXMF in as many of the hardwired paths as possible.  We could
-# use the slightly different rule 's%$(texmf)/%\$$TEXMF/%g' and avoid
-# the need for the corrections below.  But if texmf.in is edited
-# the heuristic may no longer work.
-	echo 's%$(texmf)%\$$TEXMF%g' >>$@
-# Now we repair the damage this may have caused.  Don't replace the rhs of
-# the TEXMFMAIN assignment itself, then we'd end up with TEXMFMAIN = $TEXMF
-# and TEXMF = $TEXMFMAIN.  The (commented) assignment of TEXMFLOCAL is
-# likely to have been mangled as well.
-	echo '/^ *TEXMFMAIN[ =]/s%\$$TEXMF%$(texmf)%' >>$@
-	echo '/^[% ]*TEXMFLOCAL[ =]/s%\$$TEXMF%$(texmf)%' >>$@
-	echo '/^[% ]*TEXMFDIST[ =]/s%\$$TEXMF%$(texmf)%' >>$@
-	echo '/^[% ]*VARTEXMF[ =]/s%\$$TEXMF%$(texmf)%' >>$@
-	echo '/^[% ]*TEXMFSYSVAR[ =]/s%\$$TEXMF%$(texmf)%' >>$@
-	echo '/^[% ]*TEXMFSYSCONFIG[ =]/s%\$$TEXMF%$(texmf)%' >>$@
-	echo '/^[% ]*TEXMFSYSVAR[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
-	echo '/^[% ]*TEXMFSYSCONFIG[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
-	echo '/^[% ]*TEXMFVAR[ =]/s%\$$TEXMF%$(texmf)%' >>$@
-	echo '/^[% ]*TEXMFCONFIG[ =]/s%\$$TEXMF%$(texmf)%' >>$@
-	echo '/^[% ]*TEXMFVAR[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
-	echo '/^[% ]*TEXMFCONFIG[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
-	echo '/^[% ]*TEXMFCNF[ =]/s%\$$TEXMF%$(texmf)%' >>$@
-# And fill in the last clause of TEXMFCNF with an absolute path.
-	echo '/^ *TEXMFCNF[ =]/s%@web2c@%$(web2cdir)%' >>$@
-
 # First null out comments and leading/trailing whitespace, then remove
 # lines that define invalid C identifiers, then remove blank lines and
 # lines that define lowercase values (those are never path values). Each
@@ -106,34 +69,44 @@ texmf.sed: Makefile
 # No backslash-newline escapes in the long sed replacement because that
 # will turn into a space in the output.
 # 
-# Without the $TEXMF/prefix/etc. substitutions, if the cnf file was
-# not found, the compile-time paths would be of little use, since TEXMF
-# (etc.) wouldn't be defined. Alternatively, we could have a way to
-# specify compile-time default values for variables in general, but I
-# think it's better to keep the last-resort paths as simple as possible.
+# We replace the $TEXMF* references with nonexisting directories.  These
+# are the compile-time defaults and are not useful in the native TL
+# builds; we rely completely on the self-location.  (Previously, the
+# random build-time paths would get included in the binaries, to
+# consequent confusion.)
+# 
+# We preserve the $SELFAUTO* references, since the selfauto-using
+# compile-time path for cnf files is how texmf.cnf gets found, which
+# determines everything else.
 # 
 # The definition of DEFAULT_TEXMF (and other variables)
 # that winds up in the final paths.h will not be used.
 #
 # We don't want to rewrite paths.h when we have only changed comments
-# in texmf.in that have no effect on paths.h, since that would cause
+# in texmf.cnf that have no effect on paths.h, since that would cause
 # almost everything to be rebuilt.
 #
-# We also replace all semicolons with colons in the paths.  Ultimately
-# the path-splitting code should be changed to understand both.
+# We also replace all semicolons with colons in the paths.
+# The path-splitting code should be changed to understand both.
+#
 $(kpathsea_dir)/paths.h: stamp-paths
-stamp-paths: texmf.cnf
+stamp-paths: $(srcdir)/texmf.cnf
 	echo "/* paths.h: Generated from texmf.cnf. */" >paths.tmp
-	sed -e 's/%.*//' -e 's/^[ 	]*//' -e 's/[ 	]*$$//' texmf.cnf \
+	sed -e 's/%.*//' -e 's/^[ 	]*//' -e 's/[ 	]*$$//' $(srcdir)/texmf.cnf \
 	| grep '^[ 	]*[A-Z0-9_]*[ 	=]' \
 	| sed '/^$$/d' \
 	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \
 	| tr '%' '\012' \
-	| sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \
-	      -e 's%\$$TEXMF%$(texmf)%g' \
-	      -e 's%\$$VARTEXFONTS%$(vartexfonts)%g' \
-	      -e 's%\$$web2cdir%$(web2cdir)%g' \
-	      -e 's%\$$prefix%$(prefix)%g' \
+	| sed -e 's%\$$TEXMFCONFIG%/nonesuch/texmfconfig%g' \
+	      -e 's%\$$TEXMFDIST%/nonesuch/texmfdist%g' \
+	      -e 's%\$$TEXMFDOCDIR%/nonesuch/texmfdocdir%g' \
+	      -e 's%\$$TEXMFLOCAL%/nonesuch/texmflocal%g' \
+	      -e 's%\$$TEXMFMAIN%/nonesuch/texmfmain%g' \
+	      -e 's%\$$TEXMFSYSCONFIG%/nonesuch/texmfsysconfig%g' \
+	      -e 's%\$$TEXMFSYSVAR%/nonesuch/texmfsysvar%g' \
+	      -e 's%\$$TEXMFVAR%/nonesuch/texmfvar%g' \
+	      -e 's%\$$TEXMF%/nonesuch/texmf%g' \
+	      -e 's%\$$VARTEXFONTS%/nonesuch/vartexfonts%g' \
 	| sed -e 's%;%:%g' \
 	>>paths.tmp
 	@if cmp -s paths.h paths.tmp 2>/dev/null; then \
@@ -174,10 +147,6 @@ install-exec: kpsewhich
 	   || test ! -r $(scriptdir)/mktexlsr; then \
 	  $(INSTALL_SCRIPT) $(srcdir)/mktexlsr $(scriptdir)/mktexlsr; \
 	else true; fi
-#	if grep 'original mktexfmt --' $(scriptdir)/mktexfmt > /dev/null 2>&1\
-#	   || test ! -r $(scriptdir)/mktexfmt; then \
-#	  $(INSTALL_SCRIPT) $(srcdir)/mktexfmt $(scriptdir)/mktexfmt; \
-#	else true; fi
 	$(INSTALL_DATA) $(srcdir)/mktex.opt $(web2cdir)/mktex.opt
 	$(INSTALL_SCRIPT) $(srcdir)/mktexdir $(web2cdir)/mktexdir
 	$(INSTALL_DATA) $(srcdir)/mktexdir.opt $(web2cdir)/mktexdir.opt
@@ -196,11 +165,11 @@ uninstall-exec:
 	$(UNINSTALL_PROGRAM) $(bindir)/kpseaccess
 	$(UNINSTALL_PROGRAM) $(bindir)/kpsereadlink
 
-install-data: texmf.cnf kpathsea.info install-man
+install-data: $(srcdir)/texmf.cnf kpathsea.info install-man
 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf) $(infodir) $(web2cdir)
 	if grep 'original texmf.cnf --' $(web2cdir)/texmf.cnf >/dev/null 2>&1 \
 	   || test ! -r $(web2cdir)/texmf.cnf; then \
-	  $(INSTALL_DATA) texmf.cnf $(web2cdir)/texmf.cnf; \
+	  $(INSTALL_DATA) $(srcdir)/texmf.cnf $(web2cdir)/texmf.cnf; \
 	else true; fi
 # Info files.
 	$(INSTALL_DATA) $(srcdir)/kpathsea.i* $(infodir)/
@@ -277,7 +246,7 @@ mostlyclean::
 	rm -f kpsewhich kpsestat kpseaccess kpsereadlink *.lo
 	$(LIBTOOL) --mode=clean $(RM) lib$(library).la
 distclean::
-	rm -f paths.h texmf.cnf texmf.sed stamp-paths
+	rm -f paths.h stamp-paths
 
 # The manual pages
 manfiles = kpseaccess.1 kpsestat.1 kpsewhich.1 kpsereadlink.1 \
diff --git a/Build/source/texk/kpathsea/cnf.c b/Build/source/texk/kpathsea/cnf.c
index c0555b06d70..89fc9c93da8 100644
--- a/Build/source/texk/kpathsea/cnf.c
+++ b/Build/source/texk/kpathsea/cnf.c
@@ -222,19 +222,22 @@ kpse_cnf_get P1C(const_string, name)
 
   /* When we expand the compile-time value for DEFAULT_TEXMFCNF,
      we end up needing the value for TETEXDIR and other variables,
-     so kpse_var_expand ends up calling us again.  No good.  */
+     so kpse_var_expand ends up calling us again.  No good.  Except this
+     code is not sufficient, somehow the ls-R path needs to be
+     computed when initializing the cnf path.  Better to ensure that the
+     compile-time path does not contain variable references.  */
   if (doing_cnf_init)
     return NULL;
     
   if (cnf_hash.size == 0) {
+    /* Read configuration files and initialize databases.  */
     doing_cnf_init = true;
     read_all_cnf ();
     doing_cnf_init = false;
     
-    /* Here's a pleasant kludge: Since `kpse_init_dbs' recursively calls
-       us, we must call it from outside a `kpse_path_element' loop
-       (namely, the one in `read_all_cnf' above): `kpse_path_element' is
-       not reentrant.  */
+    /* Since `kpse_init_db' recursively calls us, we must call it from
+       outside a `kpse_path_element' loop (namely, the one in
+       `read_all_cnf' above): `kpse_path_element' is not reentrant.  */
     kpse_init_db ();
   }
   
diff --git a/Build/source/texk/kpathsea/depend.mk b/Build/source/texk/kpathsea/depend.mk
index 5d0a2b14b22..6da60fe19c5 100644
--- a/Build/source/texk/kpathsea/depend.mk
+++ b/Build/source/texk/kpathsea/depend.mk
@@ -392,28 +392,6 @@ kdefault.lo: kdefault.c \
   $(kpathsea_srcdir)/c-pathch.h \
   $(kpathsea_srcdir)/c-ctype.h \
   $(kpathsea_srcdir)/default.h
-kpsecheck.lo: kpsecheck.c \
-  $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
-  $(kpathsea_srcdir)/c-std.h \
-  $(kpathsea_srcdir)/c-unistd.h \
-  $(kpathsea_srcdir)/systypes.h \
-  getopt.h \
-  $(kpathsea_srcdir)/c-memstr.h \
-  $(kpathsea_srcdir)/c-errno.h \
-  $(kpathsea_srcdir)/c-minmax.h \
-  $(kpathsea_srcdir)/c-limits.h \
-  $(kpathsea_srcdir)/c-proto.h \
-  $(kpathsea_srcdir)/debug.h \
-  $(kpathsea_srcdir)/types.h \
-  $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/getopt.h \
-  $(kpathsea_srcdir)/c-pathch.h \
-  $(kpathsea_srcdir)/c-ctype.h \
-  $(kpathsea_srcdir)/proginit.h \
-  $(kpathsea_srcdir)/tex-file.h \
-  $(kpathsea_srcdir)/c-vararg.h 
 kpsestat.o: kpsestat.c \
   $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
   $(kpathsea_srcdir)/c-std.h \
@@ -453,6 +431,7 @@ kpsewhich.o: kpsewhich.c \
   $(kpathsea_srcdir)/pathsearch.h \
   $(kpathsea_srcdir)/str-llist.h \
   $(kpathsea_srcdir)/proginit.h \
+  $(kpathsea_srcdir)/str-list.h \
   $(kpathsea_srcdir)/tex-file.h \
   $(kpathsea_srcdir)/c-vararg.h \
   $(kpathsea_srcdir)/tex-glyph.h \
@@ -885,10 +864,11 @@ variable.lo: variable.c \
   $(kpathsea_srcdir)/c-ctype.h \
   $(kpathsea_srcdir)/cnf.h \
   $(kpathsea_srcdir)/fn.h \
+  $(kpathsea_srcdir)/tilde.h \
   $(kpathsea_srcdir)/variable.h
 version.lo: version.c c-auto.h \
   $(kpathsea_srcdir)/c-proto.h
-win32hash.lo: win32hash.c \
+xbasename.lo: xbasename.c \
   $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
   $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
@@ -903,10 +883,24 @@ win32hash.lo: win32hash.c \
   $(kpathsea_srcdir)/types.h \
   $(kpathsea_srcdir)/lib.h \
   $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-ctype.h \
-  $(kpathsea_srcdir)/hash.h \
-  $(kpathsea_srcdir)/str-list.h
-xbasename.lo: xbasename.c \
+  $(kpathsea_srcdir)/c-pathch.h \
+  $(kpathsea_srcdir)/c-ctype.h
+xcalloc.lo: xcalloc.c \
+  $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
+  $(kpathsea_srcdir)/c-std.h \
+  $(kpathsea_srcdir)/c-unistd.h \
+  $(kpathsea_srcdir)/systypes.h \
+  getopt.h \
+  $(kpathsea_srcdir)/c-memstr.h \
+  $(kpathsea_srcdir)/c-errno.h \
+  $(kpathsea_srcdir)/c-minmax.h \
+  $(kpathsea_srcdir)/c-limits.h \
+  $(kpathsea_srcdir)/c-proto.h \
+  $(kpathsea_srcdir)/debug.h \
+  $(kpathsea_srcdir)/types.h \
+  $(kpathsea_srcdir)/lib.h \
+  $(kpathsea_srcdir)/progname.h
+xdirname.lo: xdirname.c \
   $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
   $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
@@ -923,7 +917,7 @@ xbasename.lo: xbasename.c \
   $(kpathsea_srcdir)/progname.h \
   $(kpathsea_srcdir)/c-pathch.h \
   $(kpathsea_srcdir)/c-ctype.h
-xcalloc.lo: xcalloc.c \
+xfopen.lo: xfopen.c \
   $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
   $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
@@ -938,7 +932,7 @@ xcalloc.lo: xcalloc.c \
   $(kpathsea_srcdir)/types.h \
   $(kpathsea_srcdir)/lib.h \
   $(kpathsea_srcdir)/progname.h
-xdirname.lo: xdirname.c \
+xfseek.lo: xfseek.c \
   $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
   $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
@@ -952,10 +946,8 @@ xdirname.lo: xdirname.c \
   $(kpathsea_srcdir)/debug.h \
   $(kpathsea_srcdir)/types.h \
   $(kpathsea_srcdir)/lib.h \
-  $(kpathsea_srcdir)/progname.h \
-  $(kpathsea_srcdir)/c-pathch.h \
-  $(kpathsea_srcdir)/c-ctype.h
-xfopen.lo: xfopen.c \
+  $(kpathsea_srcdir)/progname.h
+xfseeko.lo: xfseeko.c \
   $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
   $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
@@ -970,7 +962,7 @@ xfopen.lo: xfopen.c \
   $(kpathsea_srcdir)/types.h \
   $(kpathsea_srcdir)/lib.h \
   $(kpathsea_srcdir)/progname.h
-xfseek.lo: xfseek.c \
+xftell.lo: xftell.c \
   $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
   $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
@@ -985,7 +977,7 @@ xfseek.lo: xfseek.c \
   $(kpathsea_srcdir)/types.h \
   $(kpathsea_srcdir)/lib.h \
   $(kpathsea_srcdir)/progname.h
-xftell.lo: xftell.c \
+xftello.lo: xftello.c \
   $(kpathsea_srcdir)/config.h $(kpathsea_dir)/c-auto.h \
   $(kpathsea_srcdir)/c-std.h \
   $(kpathsea_srcdir)/c-unistd.h \
diff --git a/Build/source/texk/kpathsea/texmf.in b/Build/source/texk/kpathsea/texmf.cnf
index 4045188ab47..46464ac12b8 100644
--- a/Build/source/texk/kpathsea/texmf.in
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -1,20 +1,11 @@
 % original texmf.cnf -- runtime path configuration file for kpathsea.
-% (If you change or delete `original' on the previous line, the
-% distribution won't install its version over yours.)
 % Public domain.
 %
 % What follows is a super-summary of what this .cnf file can
 % contain. Please read the Kpathsea manual for more information.
 %
-% texmf.cnf is generated from texmf.in, by replacing @var@ with the
-% value of the Make variable `var', via a sed file texmf.sed, generated
-% (once) by kpathsea/Makefile (itself generated from kpathsea/Makefile.in
-% by configure).
-%
 % Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
 % The `=' (and surrounding spaces) is optional.
-% No % or @ in texmf.in, for the sake of autogeneration.
-% (However, %'s and @'s can be edited into texmf.cnf or put in envvar values.)
 % $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
 %
 % Earlier entries (in the same or another file) override later ones, and
@@ -53,15 +44,15 @@
 
 % The tree containing the runtime files closely related to the specific
 % program version used:
-TEXMFMAIN = @texmf@
+TEXMFMAIN = $SELFAUTOPARENT/texmf
 
 % The main distribution tree:
-TEXMFDIST = @texmf@-dist
+TEXMFDIST = $SELFAUTOPARENT/texmf-dist
 
 % A place for local additions to a "standard" texmf tree.
 % This tree is not used for local configuration maintained by
 % texconfig, it uses TEXMFCONFIG below.
-TEXMFLOCAL = @texmf@-local
+TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
 
 % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
 % With teTeX-3.0 or later, this must be set.
@@ -69,7 +60,7 @@ TEXMFLOCAL = @texmf@-local
 %   TEXMFSYSVAR = $TEXMFMAIN
 % For using a separate tree:
 %   TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
-TEXMFSYSVAR = @texmf@-var
+TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
 
 % TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
 % With teTeX-3.0 or later, this must be set.
@@ -77,7 +68,7 @@ TEXMFSYSVAR = @texmf@-var
 %   TEXMFSYSCONFIG = $TEXMFMAIN
 % For using a separate tree:
 %   TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
-TEXMFSYSCONFIG = @texmf@-config
+TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
 
 % User texmf trees are allowed as follows.
 % This used to be HOMETEXMF.
@@ -119,7 +110,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST
 % Where generated fonts may be written.  This tree is used when the sources
 % were found in a system tree and either that tree wasn't writable, or the
 % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = @vartexfonts@
+VARTEXFONTS = $TEXMFVAR/fonts
 
 % Where to look for ls-R files.  There need not be an ls-R in the
 % directories in this path, but if there is one, Kpathsea will use it.
@@ -372,8 +363,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
 % For xdvi to find mime.types and .mailcap, if they do not exist in
 % ~.  These are single directories, not paths.
 % (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = @prefix@/etc
-MAILCAPLIBDIR = @prefix@/etc
+MIMELIBDIR = $SELFAUTOPARENT/etc
+MAILCAPLIBDIR = $SELFAUTOPARENT/etc
 
 % Default settings for fontconfig library, used by Win32 versions of  
 % xetex/xdvipdfmx (note that fontconfig on Linux/Unix-like systems 
@@ -402,7 +393,7 @@ OTPINPUTS = .;$TEXMF/omega/otp//
 OCPINPUTS = .;$TEXMF/omega/ocp//
 
 % Some additional input variables for several programs.  If you add
-% a program that uses the 'other text files' or 'other binary files'
+% a program that uses the `other text files' or `other binary files'
 % search formats, you'll want to add their variables here as well.
 T4HTINPUTS   = .;$TEXMF/tex4ht//
 
@@ -433,12 +424,9 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
 % The SELFAUTO* variables are set automatically from the location of
 % argv[0], in kpse_set_progname.
 % 
-% The TETEXDIR stuff isn't likely to be relevant unless you're using
-% teTeX, but it doesn't hurt.
-%
-% For security reasons, it is better not to have . part of the path.
+% For security reasons, it is better not to include . in this path.
 %
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};/.$TETEXDIR;$TEXMF/web2c;@web2c@
+TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
 
 # kpathsea 3.5.3 and later sets these at runtime. To avoid empty
 # expansions from binaries linked against an earlier version of the
@@ -452,6 +440,7 @@ engine = unsetengine
 % If this is true, `tex a.b' will look first for a.b.tex (within each
 % path element), and then for a.b, i.e., we try standard extensions
 % first.  If this is false, we first look for a.b and then a.b.tex,
+% first.  If this is false, we first look for a.b and then a.b.tex,
 % i.e., we try the name as-is first.
 % 
 % Both names are always tried; the difference is the order in which they
@@ -464,7 +453,6 @@ engine = unsetengine
 % The default is true, because we already avoid adding the standard
 % extension(s) in most common cases.  E.g., babel.sty will only look for
 % babel.sty, not babel.sty.tex, regardless of this setting.
-% 
 try_std_extension_first = t
 
 % Enable system commands via \write18{...}?  Obviously insecure, despite
diff --git a/Build/source/texk/make/ChangeLog b/Build/source/texk/make/ChangeLog
index d34be793a7f..95c644a5e89 100644
--- a/Build/source/texk/make/ChangeLog
+++ b/Build/source/texk/make/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-29  Karl Berry  <karl@tug.org>
+
+	* tkpathsea.mk: no more texmf.in, use texmf.cnf instead.
+
 2008-03-05  Karl Berry  <karl@tug.org>
 
 	* makevars.mk: pass sysconfdir, localstatedir, libexecdir.
diff --git a/Build/source/texk/make/paths.mk b/Build/source/texk/make/paths.mk
index 571b6c4593c..91248a71359 100644
--- a/Build/source/texk/make/paths.mk
+++ b/Build/source/texk/make/paths.mk
@@ -1,8 +1,5 @@
 # paths.mk -- installation directories.
-#
-# The compile-time paths are defined in kpathsea/paths.h, which is built
-# from kpathsea/texmf.in and these definitions.  See kpathsea/INSTALL
-# for how the various path-related files are used and created.
+# $Id$
 
 # Do not change prefix and exec_prefix in Makefile.in!
 # configure doesn't propagate the change to the other Makefiles.
@@ -49,10 +46,10 @@ libexecdir = @libexecdir@
 # TeX system-specific directories. Not all of the following are relevant
 # for all programs, but it seems cleaner to collect everything in one place.
 
-# The default paths are now in kpathsea/texmf.in. Passing all the
-# paths to sub-makes can make the arg list too long on system V.
-# Note that if you make changes below, you will have to make the
-# corresponding changes to texmf.in or texmf.cnf yourself.
+# The default paths are in kpathsea/texmf.cnf. Passing all the paths to
+# sub-makes can make the arg list too long.  If you make
+# changes below, you will have to make the corresponding changes to
+# texmf.cnf yourself.
 
 # The root of the main tree.
 texmf = @texmfmain@
@@ -101,6 +98,6 @@ psheaderdir = $(dvipsdir)
 # overridden by the envvar TEXSIZES, and by a program-specific variable
 # (e.g., XDVISIZES), and perhaps by a config file (e.g., in dvips).
 # This list must be sorted in ascending order.
-default_texsizes = 300:600
+default_texsizes = 600
 
 # End of paths.mk.
diff --git a/Build/source/texk/make/tkpathsea.mk b/Build/source/texk/make/tkpathsea.mk
index b337ce1858f..fdeb2a3cbb4 100644
--- a/Build/source/texk/make/tkpathsea.mk
+++ b/Build/source/texk/make/tkpathsea.mk
@@ -1,12 +1,13 @@
 # tkpathsea.mk -- target for remaking kpathsea.
+# $Id$
 makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' $(XMAKEARGS)
 
 # This is wrong: the library doesn't depend on kpsewhich.c or
 # acconfig.h.  But what to do?
 $(kpathsea): $(kpathsea_srcdir)/*.c $(kpathsea_srcdir)/*.h \
-	     $(kpathsea_srcdir)/texmf.in $(top_srcdir)/../make/paths.mk
+	     $(top_srcdir)/../make/paths.mk
 	cd $(kpathsea_dir) && $(MAKE) $(makeargs)
 
-$(kpathsea_dir)/paths.h: $(kpathsea_srcdir)/texmf.in
+$(kpathsea_dir)/paths.h: $(kpathsea_srcdir)/texmf.cnf
 	cd $(kpathsea_dir) && $(MAKE) $(makeargs)
 # End of tkpathsea.mk.
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 179beb6c4a3..c2c036e4cef 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -105,10 +105,10 @@ install-exec:
 # 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_mktexlsr = (TEXMFDBS=$(texmf); export TEXMFDBS; $(bindir)/mktexlsr $(texmf))
 run_texlinks = $(bindir)/texlinks
 run-texlinks:
-	PATH=$(bindir):$(PATH); $(run_mktexlsr); $(run_texlinks)
+	PATH=$(bindir):$(PATH); export PATH; $(run_mktexlsr); $(run_texlinks)
 
 kpse_include ../make/clean.mk