diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/luarocks/cfg.lua | 1 | ||||
-rw-r--r-- | src/luarocks/deps.lua | 2 | ||||
-rw-r--r-- | src/luarocks/path.lua | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 787367f1..6007db2f 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua | |||
@@ -234,6 +234,7 @@ if detected.windows then | |||
234 | defaults.variables.LUALIB = "lua5.1.lib" | 234 | defaults.variables.LUALIB = "lua5.1.lib" |
235 | defaults.variables.CFLAGS = "/MD /O2" | 235 | defaults.variables.CFLAGS = "/MD /O2" |
236 | defaults.variables.LIBFLAG = "/dll" | 236 | defaults.variables.LIBFLAG = "/dll" |
237 | defaults.variables.LUALIB = "lua5.1.lib" | ||
237 | defaults.external_deps_patterns = { | 238 | defaults.external_deps_patterns = { |
238 | bin = { "?.exe", "?.bat" }, | 239 | bin = { "?.exe", "?.bat" }, |
239 | lib = { "?.lib", "?.dll", "lib?.dll" }, | 240 | lib = { "?.lib", "?.dll", "lib?.dll" }, |
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua index c9155ef5..227ce9f8 100644 --- a/src/luarocks/deps.lua +++ b/src/luarocks/deps.lua | |||
@@ -317,7 +317,7 @@ local function match_dep(dep, blacklist) | |||
317 | 317 | ||
318 | local versions | 318 | local versions |
319 | if dep.name == "lua" then | 319 | if dep.name == "lua" then |
320 | versions = { _VERSION:gsub("Lua ", "") } | 320 | versions = { (_VERSION:gsub("Lua ", "")) } |
321 | else | 321 | else |
322 | versions = manif_core.get_versions(dep.name) | 322 | versions = manif_core.get_versions(dep.name) |
323 | end | 323 | end |
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua index 585485dd..9b7f6bc7 100644 --- a/src/luarocks/path.lua +++ b/src/luarocks/path.lua | |||
@@ -52,19 +52,19 @@ end | |||
52 | 52 | ||
53 | function deploy_lua_dir(repo) | 53 | function deploy_lua_dir(repo) |
54 | if type(repo) == "string" then | 54 | if type(repo) == "string" then |
55 | return repo..cfg.lua_modules_path | 55 | return dir.path(repo, cfg.lua_modules_path) |
56 | else | 56 | else |
57 | assert(type(repo) == "table") | 57 | assert(type(repo) == "table") |
58 | return repo.lua_dir or repo.root..cfg.lua_modules_path | 58 | return repo.lua_dir or dir.path(repo.root, cfg.lua_modules_path) |
59 | end | 59 | end |
60 | end | 60 | end |
61 | 61 | ||
62 | function deploy_lib_dir(repo) | 62 | function deploy_lib_dir(repo) |
63 | if type(repo) == "string" then | 63 | if type(repo) == "string" then |
64 | return repo..cfg.lib_modules_path | 64 | return dir.path(repo, cfg.lib_modules_path) |
65 | else | 65 | else |
66 | assert(type(repo) == "table") | 66 | assert(type(repo) == "table") |
67 | return repo.lib_dir or repo.root..cfg.lib_modules_path | 67 | return repo.lib_dir or dir.path(repo.root, cfg.lib_modules_path) |
68 | end | 68 | end |
69 | end | 69 | end |
70 | 70 | ||