fix makeself

2 files changed, 13 insertions, 4 deletions

diff --git a/core/xpack.lua b/core/xpack.lua
index d0d139317..e789423c2 100644
--- a/core/xpack.lua
+++ b/core/xpack.lua
@@ -79,6 +79,7 @@ xpack_component("LongPath")
 xpack("xmakesrc")
     set_formats("srczip", "srctargz", "runself")
     set_basename("xmake-v$(version)")
+    set_prefixdir("xmake-$(version)")
     before_package(function (package)
         import("devel.git")
 
@@ -95,8 +96,7 @@ xpack("xmakesrc")
             end
         end
 
-        local prefixdir = "xmake-" .. package:version()
-        local extraconf = {rootdir = rootdir, prefixdir = prefixdir}
+        local extraconf = {rootdir = rootdir}
         package:add("sourcefiles", path.join(rootdir, "core/**|src/pdcurses/**|src/luajit/**|src/tbox/tbox/src/demo/**"), extraconf)
         package:add("sourcefiles", path.join(rootdir, "xmake/**"), extraconf)
         package:add("sourcefiles", path.join(rootdir, "*.md"), extraconf)
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")