Merge pull request #145 from Tieske/move_win_binaries

moved windows binaries into a 'bin' subdirectory.

2 files changed, 2 insertions, 1 deletions

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index df1be2bb..62c69597 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -296,7 +296,7 @@ if detected.windows then
       "MKDIR", "MV", "PWD", "RMDIR", "RM", "TEST", "UNAME", "WGET" }
    for _, var in ipairs(bins) do
       if defaults.variables[var] then
-         defaults.variables[var] = full_prefix.."\\"..defaults.variables[var]
+         defaults.variables[var] = full_prefix.."\\bin\\"..defaults.variables[var]
       end
    end
 
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 73798cbe..f60b8f5b 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -107,6 +107,7 @@ end
 -- @return boolean: true on success, false on failure.
 function make_dir(directory)
    assert(directory)
+   directory = dir.normalize(directory)
    fs.execute(fs.quiet(vars.MKDIR.." -p "..fs.Q(directory)))
    if not fs.is_dir(directory) then
       return false, "failed making directory "..directory