From 09069e648e3c27ca8d989e77c434b5a0acba0b0f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 28 Aug 2011 18:16:32 +0000 Subject: duplicate TEXINPUTS.*lualatex instead of using $TEXINPUTS, to avoid default expansion problems git-svn-id: svn://tug.org/texlive/trunk@23729 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 8 ++++++++ Build/source/texk/kpathsea/texmf.cnf | 15 ++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index e86c0a9356a..6863de9bda5 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,11 @@ +2011-08-28 Karl Berry + + * texmf.cnf (LUAINPUTS.lualatex, LUAINPUTS.dvilualatex): new defns. + (LUAINPUTS): duplicate value of TEXINPUTS.luatex, instead + of using $TEXINPUTS. + Report from Herbert Voss, 15 Aug 2011 23:53:45, + among others. + 2011-08-12 Peter Breitenlohner * version.ac: Update version number 6.0.2dev => 6.1.0dev. diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf index 96d50be06ec..73eee4d7c36 100644 --- a/Build/source/texk/kpathsea/texmf.cnf +++ b/Build/source/texk/kpathsea/texmf.cnf @@ -407,10 +407,19 @@ TW_INIPATH = $TW_LIBPATH % would allow command execution. DVIPDFMXINPUTS = $TEXMF/dvipdfmx -% Find scripts that are distributed/installed in the texmf tree. - % Lua needs to look in TEXINPUTS for lua scripts distributed with packages. -LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS +% +% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in +% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended +% default expansion of TEXINPUTS will not happen and .lua files under +% the /tex/ will not be found. +% +% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex. +% The default LUAINPUTS sufficess for luatex and dviluatex. +% +LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}// % Lua needs to look for binary lua libraries distributed with packages. CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// -- cgit v1.2.3