diff options
-rw-r--r-- | src/luarocks/core/cfg.lua | 3 | ||||
-rw-r--r-- | win32/COPYING | 2 | ||||
-rw-r--r-- | win32/tools/pwd.exe | bin | 61440 -> 0 bytes |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index 58ed1ac6..fca315e0 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua | |||
@@ -285,6 +285,7 @@ local function make_defaults(lua_version, target_cpu, platforms, home) | |||
285 | defaults.external_deps_dirs = { "c:/external/", "c:/windows/system32" } | 285 | defaults.external_deps_dirs = { "c:/external/", "c:/windows/system32" } |
286 | 286 | ||
287 | defaults.makefile = "Makefile.win" | 287 | defaults.makefile = "Makefile.win" |
288 | defaults.variables.PWD = "echo %cd%" | ||
288 | defaults.variables.MAKE = "nmake" | 289 | defaults.variables.MAKE = "nmake" |
289 | defaults.variables.CC = "cl" | 290 | defaults.variables.CC = "cl" |
290 | defaults.variables.RC = "rc" | 291 | defaults.variables.RC = "rc" |
@@ -762,7 +763,7 @@ function cfg.init(detected, warning) | |||
762 | local defaults = make_defaults(cfg.lua_version, processor, platforms, cfg.home) | 763 | local defaults = make_defaults(cfg.lua_version, processor, platforms, cfg.home) |
763 | 764 | ||
764 | if platforms.windows and hardcoded.WIN_TOOLS then | 765 | if platforms.windows and hardcoded.WIN_TOOLS then |
765 | local tools = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM", "PWD", "WGET", } | 766 | local tools = { "SEVENZ", "CP", "FIND", "LS", "MD5SUM", "WGET", } |
766 | for _, tool in ipairs(tools) do | 767 | for _, tool in ipairs(tools) do |
767 | defaults.variables[tool] = '"' .. hardcoded.WIN_TOOLS .. "/" .. defaults.variables[tool] .. '.exe"' | 768 | defaults.variables[tool] = '"' .. hardcoded.WIN_TOOLS .. "/" .. defaults.variables[tool] .. '.exe"' |
768 | end | 769 | end |
diff --git a/win32/COPYING b/win32/COPYING index 7fd84ab1..b5bed84d 100644 --- a/win32/COPYING +++ b/win32/COPYING | |||
@@ -4,7 +4,7 @@ following licenses: | |||
4 | 4 | ||
5 | * For 7z.exe and 7z.dll, please see COPYING_7z for details. | 5 | * For 7z.exe and 7z.dll, please see COPYING_7z for details. |
6 | 6 | ||
7 | * find.exe, mv.exe, wget.exe, ls.exe, pwd.exe, md5sum.exe, | 7 | * find.exe, mv.exe, wget.exe, ls.exe, md5sum.exe, |
8 | cp.exe, and uname.exe are part of UnxUtils, check | 8 | cp.exe, and uname.exe are part of UnxUtils, check |
9 | http://unxutils.sourceforge.net/ for license information. | 9 | http://unxutils.sourceforge.net/ for license information. |
10 | 10 | ||
diff --git a/win32/tools/pwd.exe b/win32/tools/pwd.exe deleted file mode 100644 index 7dd114de..00000000 --- a/win32/tools/pwd.exe +++ /dev/null | |||
Binary files differ | |||