1 files changed, 4 insertions, 10 deletions

diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index f2d02ded..8c5aa0da 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -263,18 +263,12 @@ function configure_paths(rockspec)
    rockspec.variables = vars
 end
 
-function versioned_name(file, name, version)
+function versioned_name(file, prefix, name, version)
    assert(type(file) == "string")
    assert(type(name) == "string")
    assert(type(version) == "string")
 
-   name = name:gsub("%-", "_")
-   version = version:gsub("%-", "_")
-   return dir.path(dir.dir_name(file), name.."_"..version.."-"..dir.base_name(file))
-end
-
-function unversioned_name(file)
-   assert(type(file) == "string")
-
-   return dir.path(dir.dir_name(file), dir.base_name(file):match("^[^-]+-(.*)"))
+   local rest = file:gsub("^"..prefix.."/*", "")
+   name_version = (name.."_"..version):gsub("%-", "_"):gsub("%.", "_")
+   return dir.path(prefix, name_version.."-"..rest)
 end