Merge branch 'master' of github.com:keplerproject/luarocks

2 files changed, 13 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 6b1ff98f..ae89d90a 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,8 @@ check_makefile:
 cleanup_bins:
         for f in $(BIN_FILES) ;\
         do \
-           sed -i.bak "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" src/bin/$$f ;\
+           mv src/bin/$$f{,.bak} ;\
+           sed "s,^#!.*lua.*,#!/usr/bin/env lua,;/^package.path/d" < src/bin/$$f.bak > src/bin/$$f ;\
            rm src/bin/$$f.bak ;\
         done
 
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 8527ba52..af1062f8 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -77,6 +77,9 @@ elseif system == "Darwin" then
 elseif system == "Linux" then
    detected.unix = true
    detected.linux = true
+elseif system == "SunOS" then
+   detected.unix = true
+   detected.solaris = true
 elseif system and system:match("^CYGWIN") then
    detected.unix = true
    detected.cygwin = true
@@ -372,6 +375,14 @@ if detected.openbsd then
    defaults.variables.STATFLAG = "-f '%Op'"
 end
 
+if detected.solaris then
+   defaults.arch = "solaris-"..proc
+   defaults.platforms = {"unix", "solaris"}
+   defaults.variables.MAKE = "gmake"
+   defaults.variables.CC = "gcc"
+   defaults.variables.LD = "gcc"
+end
+
 -- Expose some more values detected by LuaRocks for use by rockspec authors.
 defaults.variables.LUA = defaults.lua_interpreter
 defaults.variables.LIB_EXTENSION = defaults.lib_extension