From 18f193ed0b7da9eaa2d62794de30a0a923776616 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 12 Sep 2018 23:56:41 +0800 Subject: improve to install package --- xmake/actions/require/action/install.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xmake/actions/require') diff --git a/xmake/actions/require/action/install.lua b/xmake/actions/require/action/install.lua index a270b538c..123521004 100644 --- a/xmake/actions/require/action/install.lua +++ b/xmake/actions/require/action/install.lua @@ -56,15 +56,15 @@ function _make_package(package) -- get links local links = {} for _, filename in ipairs(os.files(path.join(linkdir, target.filename("*", "static"))), path.filename) do - local link, count = filename:gsub(target.filename("([%%w%%-_]+)", "static"):gsub("%.", "%%.") .. "$", "%1") - if count > 0 then + local link = target.linkname(filename) + if link then table.insert(links, link) end end if #links == 0 then for _, filename in ipairs(os.files(path.join(linkdir, target.filename("*", "shared"))), path.filename) do - local link, count = filename:gsub(target.filename("([%%w%%-_]+)", "shared"):gsub("%.", "%%.") .. "$", "%1") - if count > 0 then + local link = target.linkname(filename) + if link then table.insert(links, link) end end -- cgit v1.3.1