diff options
author | Karl Berry <karl@freefriends.org> | 2007-11-30 23:58:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2007-11-30 23:58:29 +0000 |
commit | e9f2f6716f9c06ce07b3a1dd2f0ea8db2c6faef6 (patch) | |
tree | f4793df4a584d6f7ef0be408bed4ec087d6607bc | |
parent | 1399c42b9559f6cc748823a3fc38f75f0750ffab (diff) |
switch to /$engine, no //
git-svn-id: svn://tug.org/texlive/trunk@5659 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/texmf.in | 6 | ||||
-rw-r--r-- | Master/texmf/web2c/texmf.cnf | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 4b4ebb8f66b..889d80db6da 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2007-12-01 Karl Berry <karl@tug.org> + + * texmf.in (MPMEMS, MFBASES, TEXFORMATS): switch to /$engine, + to try to avoid finding a format for the wrong engine. + From Akira. + 2007-11-05 Karl Berry <karl@tug.org> * texmf.in (allow_multiple_suffixes): unimplemented. diff --git a/Build/source/texk/kpathsea/texmf.in b/Build/source/texk/kpathsea/texmf.in index ecf67934e19..3dc80d864ac 100644 --- a/Build/source/texk/kpathsea/texmf.in +++ b/Build/source/texk/kpathsea/texmf.in @@ -267,9 +267,9 @@ TEXDOCEXT = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS} % web2c/INSTALL), and string pools (.pool) for ini{tex,mf,mp}. It is % painful that we have six paths and directories here (they all resolve % to a single place by default), but historically ... -TEXFORMATS = .;$TEXMF/web2c/{$engine,}// -MFBASES = .;$TEXMF/web2c/{$engine,}// -MPMEMS = .;$TEXMF/web2c/{$engine,}// +TEXFORMATS = .;$TEXMF/web2c{/$engine,} +MFBASES = .;$TEXMF/web2c{/$engine,} +MPMEMS = .;$TEXMF/web2c{/$engine,} TEXPOOL = .;$TEXMF/web2c MFPOOL = .;$TEXMF/web2c MPPOOL = .;$TEXMF/web2c diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf index ad03192e5b5..5321d057a7e 100644 --- a/Master/texmf/web2c/texmf.cnf +++ b/Master/texmf/web2c/texmf.cnf @@ -267,9 +267,9 @@ TEXDOCEXT = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS} % web2c/INSTALL), and string pools (.pool) for ini{tex,mf,mp}. It is % painful that we have six paths and directories here (they all resolve % to a single place by default), but historically ... -TEXFORMATS = .;$TEXMF/web2c/{$engine,}// -MFBASES = .;$TEXMF/web2c/{$engine,}// -MPMEMS = .;$TEXMF/web2c/{$engine,}// +TEXFORMATS = .;$TEXMF/web2c{/$engine,} +MFBASES = .;$TEXMF/web2c{/$engine,} +MPMEMS = .;$TEXMF/web2c{/$engine,} TEXPOOL = .;$TEXMF/web2c MFPOOL = .;$TEXMF/web2c MPPOOL = .;$TEXMF/web2c |