changed multiarch detection and site_config variables

3 files changed, 5 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index 6e7bee03..2f640ae6 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,8 @@ src/luarocks/site_config.lua: config.unix
         echo "LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/site_config.lua
         if [ -n "$(MULTIARCH_SUBDIR)" ] ;\
         then \
-           echo "LUAROCKS_ADD_LIB_SUBDIRS={ [[$(MULTIARCH_SUBDIR)]] }" >> src/luarocks/site_config.lua ;\
+           echo 'LUAROCKS_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[$(MULTIARCH_SUBDIR)]] }, include="include" }' >> src/luarocks/site_config.lua ;\
+           echo 'LUAROCKS_RUNTIME_EXTERNAL_DEPS_SUBDIRS={ bin="bin", lib={ "lib", [[$(MULTIARCH_SUBDIR)]] }, include="include" }' >> src/luarocks/site_config.lua ;\
         fi
 
 dev:
diff --git a/configure b/configure
index 0e64fb55..579e96f5 100755
--- a/configure
+++ b/configure
@@ -399,7 +399,7 @@ fi
 
 if [ "$LUAROCKS_UNAME_S" = Linux ]
 then
-   GCC_ARCH=`gcc -dumpspecs 2>/dev/null | grep -A 1 "^*multilib:$" | tail -1 | cut -d: -f3 | cut -d' ' -f1`
+   GCC_ARCH=`gcc -print-multiarch 2>/dev/null`
    if [ -n "$GCC_ARCH" -a -d "/usr/lib/$GCC_ARCH" ]
    then
       MULTIARCH_SUBDIR="lib/$GCC_ARCH"
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