summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea/cnf.c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-05-29 20:59:08 +0000
committerKarl Berry <karl@freefriends.org>2008-05-29 20:59:08 +0000
commit6cd8ea7a508a2ba919634750b7bcb3409f6e39f3 (patch)
treeba49bf34f27a6e1dd54c7a98e3d33ae720294432 /Build/source/texk/kpathsea/cnf.c
parent83a925beac351c221bc8499021eaf8568a758801 (diff)
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
Diffstat (limited to 'Build/source/texk/kpathsea/cnf.c')
-rw-r--r--Build/source/texk/kpathsea/cnf.c13
1 files changed, 8 insertions, 5 deletions
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 ();
}