aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPhilipp Janda <siffiejoe@gmx.net>2013-09-25 22:53:22 +0200
committerPhilipp Janda <siffiejoe@gmx.net>2013-09-25 22:53:22 +0200
commit9fd70043f8b23b73dbb7c413cbdc79142da99e12 (patch)
treee72acc737ab06294e1941e41915e9aceeb7ff026 /configure
parenta55309e6daad16938d899a2311aadab3225755ad (diff)
downloadluarocks-9fd70043f8b23b73dbb7c413cbdc79142da99e12.tar.gz
luarocks-9fd70043f8b23b73dbb7c413cbdc79142da99e12.tar.bz2
luarocks-9fd70043f8b23b73dbb7c413cbdc79142da99e12.zip
detect native multiarch directory on linux
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure11
1 files changed, 11 insertions, 0 deletions
diff --git a/configure b/configure
index a5aa1f4d..ee1106dd 100755
--- a/configure
+++ b/configure
@@ -14,6 +14,7 @@ LUA_BINDIR="/usr/bin"
14LUA_INCDIR="/usr/include" 14LUA_INCDIR="/usr/include"
15LUA_LIBDIR="/usr/lib" 15LUA_LIBDIR="/usr/lib"
16LUA_VERSION="5.1" 16LUA_VERSION="5.1"
17MULTIARCHDIR=""
17 18
18# ---------------------------------------------------------------------------- 19# ----------------------------------------------------------------------------
19# FUNCTION DEFINITIONS 20# FUNCTION DEFINITIONS
@@ -396,6 +397,15 @@ else
396 echo "Using unversioned rocks dir: $PREFIX$LUAROCKS_ROCKS_SUBDIR" 397 echo "Using unversioned rocks dir: $PREFIX$LUAROCKS_ROCKS_SUBDIR"
397fi 398fi
398 399
400if [ "$LUAROCKS_UNAME_S" = Linux ]
401then
402 CC_ARCH=`cc -dumpmachine 2>/dev/null`
403 if [ -n "$CC_ARCH" ]
404 then
405 MULTIARCHDIR="/usr/lib/$CC_ARCH"
406 fi
407fi
408
399if [ -f config.unix ]; then 409if [ -f config.unix ]; then
400 rm -f config.unix 410 rm -f config.unix
401fi 411fi
@@ -426,6 +436,7 @@ LUAROCKS_UNAME_S=$LUAROCKS_UNAME_S
426LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER 436LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER
427LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER 437LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER
428LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR 438LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR
439LUAROCKS_MULTIARCHDIR=$MULTIARCHDIR
429 440
430EOF 441EOF
431 442