aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPhilipp Janda <siffiejoe@gmx.net>2013-09-26 09:02:33 +0200
committerPhilipp Janda <siffiejoe@gmx.net>2013-09-26 09:02:33 +0200
commit4745a6e42598414fb38565c75e84bd13723372ba (patch)
tree7a74038ae3237bd55c32e386ecf2e685c8643539 /configure
parentf63fa840457558595364eec980082f9ae921d086 (diff)
downloadluarocks-4745a6e42598414fb38565c75e84bd13723372ba.tar.gz
luarocks-4745a6e42598414fb38565c75e84bd13723372ba.tar.bz2
luarocks-4745a6e42598414fb38565c75e84bd13723372ba.zip
support for tables in (runtime_)external_deps_subdirs.*
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure
index ee1106dd..0e64fb55 100755
--- a/configure
+++ b/configure
@@ -14,7 +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="" 17MULTIARCH_SUBDIR=""
18 18
19# ---------------------------------------------------------------------------- 19# ----------------------------------------------------------------------------
20# FUNCTION DEFINITIONS 20# FUNCTION DEFINITIONS
@@ -399,10 +399,10 @@ fi
399 399
400if [ "$LUAROCKS_UNAME_S" = Linux ] 400if [ "$LUAROCKS_UNAME_S" = Linux ]
401then 401then
402 CC_ARCH=`cc -dumpmachine 2>/dev/null` 402 GCC_ARCH=`gcc -dumpspecs 2>/dev/null | grep -A 1 "^*multilib:$" | tail -1 | cut -d: -f3 | cut -d' ' -f1`
403 if [ -n "$CC_ARCH" ] 403 if [ -n "$GCC_ARCH" -a -d "/usr/lib/$GCC_ARCH" ]
404 then 404 then
405 MULTIARCHDIR="/usr/lib/$CC_ARCH" 405 MULTIARCH_SUBDIR="lib/$GCC_ARCH"
406 fi 406 fi
407fi 407fi
408 408
@@ -436,7 +436,7 @@ LUAROCKS_UNAME_S=$LUAROCKS_UNAME_S
436LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER 436LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER
437LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER 437LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER
438LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR 438LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR
439LUAROCKS_MULTIARCHDIR=$MULTIARCHDIR 439MULTIARCH_SUBDIR=$MULTIARCH_SUBDIR
440 440
441EOF 441EOF
442 442