From 694b07871f9af14f2cde2c25b1ed5c5e996fae19 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg42.2a@gmail.com>
Date: Sat, 27 Dec 2014 13:27:12 +0100
Subject: [import] correctly derive ourname in tell

---
 scripts/mkimport | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/mkimport')

diff --git a/scripts/mkimport b/scripts/mkimport
index 132d026..53eba12 100644
--- a/scripts/mkimport
+++ b/scripts/mkimport
@@ -610,11 +610,11 @@ local describe = function (target, location)
 
   local dname           = def.name
   local dkind           = def.kind
-  local subdir, ourname = derive_ourname (dname, dkind)
+  local subdir, ourname = derive_ourname (def.ours or dname, dkind)
   separator ()
   status ("category       %s", cat)
   status ("kind           %s", kind_name[dkind])
-  status ("in Context     %s", derive_fullname (cat, def.name, def.kind))
+  status ("in Context     %s", derive_fullname (cat, dname, dkind))
   status ("in Luaotfload  %s", ourname)
   separator ()
   return 0
-- 
cgit v1.2.3


From 380989f0de1f2aa9a8d0a0856de1b1e09321d1e5 Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Wed, 11 Mar 2015 07:36:47 +0100
Subject: [import] fix usage message

---
 scripts/mkimport | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/mkimport')

diff --git a/scripts/mkimport b/scripts/mkimport
index 53eba12..2f64d62 100644
--- a/scripts/mkimport
+++ b/scripts/mkimport
@@ -633,7 +633,7 @@ local tell = function (arg)
 end
 
 local help = function ()
-  iowrite "usage: mkinfo  <command> [<args>]\n"
+  iowrite "usage: mkimport  <command> [<args>]\n"
   iowrite "\n"
   iowrite "Where <command> is one of\n"
   iowrite "   help      Print this help message\n"
-- 
cgit v1.2.3