summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-17 17:13:20 +0000
committerKarl Berry <karl@freefriends.org>2014-04-17 17:13:20 +0000
commit136ae9a638f030752ad667564f63a029178bd6ae (patch)
tree46994c71c844d51c16f426412ede3d9d19cca4c6 /Build/source
parent3a1a7d4c46761ce5fb8b94d5aa892ad43de7dff0 (diff)
start 2014 pretest (per doc/releng.txt)
git-svn-id: svn://tug.org/texlive/trunk@33475 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf16
2 files changed, 12 insertions, 10 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 1d9d5e68925..e21803cac92 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-17 Karl Berry <karl@tug.org>
+
+ * texmf.cnf (TEXINPUTS.pdfx{latex,mex,tex}): this engine has
+ not existed for a long time. Remove.
+ (TEXINPUTS.luajittex): same as .luatex.
+
2014-04-09 Karl Berry <karl@tug.org>
* pathsearch.h: with deep regret, #include types.h before
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 84009f51a45..e30e50d21ca 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -4,8 +4,8 @@
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes -- and only your changes, not an
% entire copy! -- in ../../texmf.cnf. That is, if this file is
-% installed in /some/path/to/texlive/2013/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2013/texmf.cnf.
+% installed in /some/path/to/texlive/2014/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2014/texmf.cnf.
%
% What follows is a super-summary of what this .cnf file can
% contain. Please read the Kpathsea manual for more information.
@@ -76,10 +76,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2013/texmf-var
+TEXMFVAR = ~/.texlive2014/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2013/texmf-config
+TEXMFCONFIG = ~/.texlive2014/texmf-config
% List all the texmf trees. For an explanation of what they are, see the
% TeX Live manual.
@@ -189,15 +189,11 @@ TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}//
TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}//
-% pdfxTeX.
-TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}//
-
% LuaTeX.
TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
+TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}//
TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}//
% XeTeX.