[latex3-commits] [git/LaTeX3-latex3-l3build] master: Fix location of base MakeIndex/BibTeX files (84b61e0)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/84b61e0d73de3eb458361717f3616b61857876f0

>---------------------------------------------------------------

commit 84b61e0d73de3eb458361717f3616b61857876f0
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Thu Dec 20 09:09:20 2018 +0000

    Fix location of  base MakeIndex/BibTeX files
    
    As reported by KB.


>---------------------------------------------------------------

84b61e0d73de3eb458361717f3616b61857876f0
 CHANGELOG.md        |    4 ++++
 l3build-install.lua |   10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2c27f0..2bab27a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Fixed
+
+- Packaging of some team-specific files
+
 ## [2018-12-18]
 
 ### Changed
diff --git a/l3build-install.lua b/l3build-install.lua
index f32dcd0..a97a24e 100644
--- a/l3build-install.lua
+++ b/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