From e393610e3f53aed9293882a668045fd67f1e1cd5 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 25 Nov 2023 00:42:14 +0800 Subject: fix makeself --- xmake/plugins/pack/xpack.lua | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'xmake/plugins/pack/xpack.lua') diff --git a/xmake/plugins/pack/xpack.lua b/xmake/plugins/pack/xpack.lua index 2a4780945..4bea5fb86 100644 --- a/xmake/plugins/pack/xpack.lua +++ b/xmake/plugins/pack/xpack.lua @@ -511,7 +511,7 @@ end -- get the installed directory function xpack:installdir(...) local installdir = self:install_rootdir() - local prefixdir = self:get("prefixdir") + local prefixdir = self:prefixdir() if prefixdir then installdir = path.join(installdir, prefixdir) end @@ -531,13 +531,22 @@ end -- get the source directory function xpack:sourcedir(...) local sourcedir = self:source_rootdir() - local prefixdir = self:get("prefixdir") + local prefixdir = self:prefixdir() if prefixdir then sourcedir = path.join(sourcedir, prefixdir) end return path.normalize(path.join(sourcedir, ...)) end +-- get the prefixdir +function xpack:prefixdir() + local prefixdir = self:get("prefixdir") + if prefixdir then + return filter.handle(prefixdir, self) + end + return prefixdir +end + -- get the binary directory function xpack:bindir() local bindir = self:get("bindir") -- cgit v1.3.1