From ab1456ac100fab623d9d9e62c3ba878930d944aa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 8 Feb 2019 23:00:59 +0000 Subject: l3build (7feb19) git-svn-id: svn://tug.org/texlive/trunk@49981 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/scripts/l3build/l3build-install.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/scripts/l3build/l3build-install.lua') diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua index f32dcd003fd..a97a24e29ec 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-install.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua @@ -93,13 +93,13 @@ function uninstall() end function install_files(target,full,dry_run) - local function install_files(source,dir,files,subdir,tool) + local function install_files(source,dir,files,subdir) subdir = subdir or moduledir -- For material associated with secondary tools (BibTeX, MakeIndex) -- the structure needed is slightly different from those items going -- into the tex/doc/source trees - if tool and module == "base" then - subdir = nil + if (dir == "makeindex" or match(dir,"$bibtex")) and module == "base" then + subdir = "latex" end dir = dir .. (subdir and ("/" .. subdir) or "") local filenames = { } @@ -222,8 +222,8 @@ function install_files(target,full,dry_run) if errorlevel ~= 0 then return errorlevel end errorlevel = install_files(unpackdir,"tex",{installlist}) - + install_files(unpackdir,"bibtex/bst",{bstfiles},module,true) - + install_files(unpackdir,"makeindex",{makeindexfiles},module,true) + + install_files(unpackdir,"bibtex/bst",{bstfiles},module) + + install_files(unpackdir,"makeindex",{makeindexfiles},module) + install_files(unpackdir,"scripts",{scriptfiles},module) return errorlevel -- cgit v1.2.3