aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--src/luarocks/build/cmake.lua2
-rw-r--r--src/luarocks/loader.lua2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b2701aa3..8933d8aa 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ install_bins: built
143 cd src/bin && for f in $(BIN_FILES); \ 143 cd src/bin && for f in $(BIN_FILES); \
144 do \ 144 do \
145 cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)"; \ 145 cp "$$f" "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)"; \
146 ln -nfs "$(DESTDIR)$(BINDIR)/$$f-$(LUA_VERSION)" "$(DESTDIR)$(BINDIR)/$$f"; \ 146 ln -nfs "$$f-$(LUA_VERSION)" "$(DESTDIR)$(BINDIR)/$$f"; \
147 done 147 done
148 148
149install_luas: built 149install_luas: built
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua
index f1737876..0df3a921 100644
--- a/src/luarocks/build/cmake.lua
+++ b/src/luarocks/build/cmake.lua
@@ -22,7 +22,7 @@ function run(rockspec)
22 22
23 util.variable_substitutions(variables, rockspec.variables) 23 util.variable_substitutions(variables, rockspec.variables)
24 24
25 if not fs.execute_quiet(rockspec.variables.CMAKE, "--help")) then 25 if not fs.execute_quiet(rockspec.variables.CMAKE, "--help") then
26 return nil, "'"..rockspec.variables.CMAKE.."' program not found. Is cmake installed? You may want to edit variables.CMAKE" 26 return nil, "'"..rockspec.variables.CMAKE.."' program not found. Is cmake installed? You may want to edit variables.CMAKE"
27 end 27 end
28 28
diff --git a/src/luarocks/loader.lua b/src/luarocks/loader.lua
index a116766c..aa3b2781 100644
--- a/src/luarocks/loader.lua
+++ b/src/luarocks/loader.lua
@@ -108,7 +108,7 @@ end
108-- @return table or (nil, string): The module table as returned by some other loader, 108-- @return table or (nil, string): The module table as returned by some other loader,
109-- or nil followed by an error message if no other loader managed to load the module. 109-- or nil followed by an error message if no other loader managed to load the module.
110local function call_other_loaders(module, name, version, module_name) 110local function call_other_loaders(module, name, version, module_name)
111 for i, loader in pairs(package.loaders) do 111 for i, loader in ipairs(package.loaders) do
112 if loader ~= luarocks_loader then 112 if loader ~= luarocks_loader then
113 local results = { loader(module_name) } 113 local results = { loader(module_name) }
114 if type(results[1]) == "function" then 114 if type(results[1]) == "function" then