diff options
author | Philipp Janda <siffiejoe@gmx.net> | 2013-09-25 22:53:22 +0200 |
---|---|---|
committer | Philipp Janda <siffiejoe@gmx.net> | 2013-09-25 22:53:22 +0200 |
commit | 9fd70043f8b23b73dbb7c413cbdc79142da99e12 (patch) | |
tree | e72acc737ab06294e1941e41915e9aceeb7ff026 /configure | |
parent | a55309e6daad16938d899a2311aadab3225755ad (diff) | |
download | luarocks-9fd70043f8b23b73dbb7c413cbdc79142da99e12.tar.gz luarocks-9fd70043f8b23b73dbb7c413cbdc79142da99e12.tar.bz2 luarocks-9fd70043f8b23b73dbb7c413cbdc79142da99e12.zip |
detect native multiarch directory on linux
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -14,6 +14,7 @@ LUA_BINDIR="/usr/bin" | |||
14 | LUA_INCDIR="/usr/include" | 14 | LUA_INCDIR="/usr/include" |
15 | LUA_LIBDIR="/usr/lib" | 15 | LUA_LIBDIR="/usr/lib" |
16 | LUA_VERSION="5.1" | 16 | LUA_VERSION="5.1" |
17 | MULTIARCHDIR="" | ||
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" |
397 | fi | 398 | fi |
398 | 399 | ||
400 | if [ "$LUAROCKS_UNAME_S" = Linux ] | ||
401 | then | ||
402 | CC_ARCH=`cc -dumpmachine 2>/dev/null` | ||
403 | if [ -n "$CC_ARCH" ] | ||
404 | then | ||
405 | MULTIARCHDIR="/usr/lib/$CC_ARCH" | ||
406 | fi | ||
407 | fi | ||
408 | |||
399 | if [ -f config.unix ]; then | 409 | if [ -f config.unix ]; then |
400 | rm -f config.unix | 410 | rm -f config.unix |
401 | fi | 411 | fi |
@@ -426,6 +436,7 @@ LUAROCKS_UNAME_S=$LUAROCKS_UNAME_S | |||
426 | LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER | 436 | LUAROCKS_DOWNLOADER=$LUAROCKS_DOWNLOADER |
427 | LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER | 437 | LUAROCKS_MD5CHECKER=$LUAROCKS_MD5CHECKER |
428 | LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR | 438 | LUAROCKS_ROCKS_SUBDIR=$LUAROCKS_ROCKS_SUBDIR |
439 | LUAROCKS_MULTIARCHDIR=$MULTIARCHDIR | ||
429 | 440 | ||
430 | EOF | 441 | EOF |
431 | 442 | ||