2 files changed, 15 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 1213a589..16c9d4fc 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,10 @@ src/luarocks/site_config.lua: config.unix
         echo "LUAROCKS_UNAME_M=[[$(LUAROCKS_UNAME_M)]]" >> src/luarocks/site_config.lua
         echo "LUAROCKS_DOWNLOADER=[[$(LUAROCKS_DOWNLOADER)]]" >> src/luarocks/site_config.lua
         echo "LUAROCKS_MD5CHECKER=[[$(LUAROCKS_MD5CHECKER)]]" >> src/luarocks/site_config.lua
+        if [ -n "$(LUAROCKS_MULTIARCHDIR)" ] ;\
+        then \
+           echo "LUAROCKS_MULTIARCHDIR=[[$(LUAROCKS_MULTIARCHDIR)]]" >> src/luarocks/site_config.lua ;\
+        fi
 
 dev:
         $(MAKE) build_bins LUADIR=$(PWD)/src
diff --git a/configure b/configure
index a5aa1f4d..ee1106dd 100755
--- a/configure
+++ b/configure
@@ -14,6 +14,7 @@ LUA_BINDIR="/usr/bin"
 LUA_INCDIR="/usr/include"
 LUA_LIBDIR="/usr/lib"
 LUA_VERSION="5.1"
+MULTIARCHDIR=""
 
 # ----------------------------------------------------------------------------
 # FUNCTION DEFINITIONS
@@ -396,6 +397,15 @@ else
    echo "Using unversioned rocks dir: $PREFIX$LUAROCKS_ROCKS_SUBDIR"
 fi
 
+if [ "$LUAROCKS_UNAME_S" = Linux ]
+then
+   CC_ARCH=`cc -dumpmachine 2>/dev/null`
+   if [ -n "$CC_ARCH" ]
+   then
+      MULTIARCHDIR="/usr/lib/$CC_ARCH"
+   fi
+fi
+
 if [ -f config.unix ]; then
    rm -f config.unix
 fi
@@ -426,6 +436,7 @@ LUAROCKS_UNAME_S=$LUAROCKS_UNAME_S
 LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER
 LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER
 LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR
+LUAROCKS_MULTIARCHDIR=$MULTIARCHDIR
 
 EOF