summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/texmf.in6
-rw-r--r--Master/texmf/web2c/texmf.cnf6
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