From 216f3601359ecf216683edb40a7da78824aa042c Mon Sep 17 00:00:00 2001
From: Philipp Janda <siffiejoe@gmx.net>
Date: Fri, 27 Sep 2013 01:30:59 +0200
Subject: changed multiarch detection and site_config variables

---
 src/luarocks/cfg.lua | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index 9227db4b..94afe0a0 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -254,12 +254,12 @@ local defaults = {
       STATFLAG = "-c '%a'",
    },
 
-   external_deps_subdirs = {
+   external_deps_subdirs = site_config.LUAROCKS_EXTERNAL_DEPS_SUBDIRS or {
       bin = "bin",
       lib = "lib",
       include = "include"
    },
-   runtime_external_deps_subdirs = {
+   runtime_external_deps_subdirs = site_config.LUAROCKS_RUNTIME_EXTERNAL_DEPS_SUBDIRS or {
       bin = "bin",
       lib = "lib",
       include = "include"
@@ -437,23 +437,6 @@ if detected.solaris then
    defaults.variables.MAKE = "gmake"
 end
 
-if type(site_config.LUAROCKS_ADD_LIB_SUBDIRS) == "table" and next(site_config.LUAROCKS_ADD_LIB_SUBDIRS) ~= nil then
-   local lib = defaults.external_deps_subdirs.lib
-   if type(lib) ~= "table" then
-      lib = { lib }
-   end
-   local rt_lib = defaults.runtime_external_deps_subdirs.lib
-   if type(rt_lib) ~= "table" then
-      rt_lib = { rt_lib }
-   end
-   for i,v in ipairs(site_config.LUAROCKS_ADD_LIB_SUBDIRS) do
-      lib[#lib+1] = v
-      rt_lib[#rt_lib+1] = v
-   end
-   defaults.external_deps_subdirs.lib = lib
-   defaults.runtime_external_deps_subdirs.lib = rt_lib
-end
-
 -- Expose some more values detected by LuaRocks for use by rockspec authors.
 defaults.variables.LIB_EXTENSION = defaults.lib_extension
 defaults.variables.OBJ_EXTENSION = defaults.obj_extension
-- 
cgit v1.2.3-55-g6feb