Software / code / prosody
Changeset
7946:c92102fe409b
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 03 Mar 2017 11:52:22 +0100 |
| parents | 7944:36a9a4af1873 (current diff) 7945:1f4a0e0b7167 (diff) |
| children | 7950:f91e7ec9654e |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Mar 02 23:03:02 2017 +0100 +++ b/configure Fri Mar 03 11:52:22 2017 +0100 @@ -338,6 +338,11 @@ fi fi +if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ] +then + LIBDIR=$PREFIX/lib +fi + detect_lua_version() { detected_lua=`$1 -e 'print(_VERSION:match(" (5%.[123])$"))' 2> /dev/null` if [ "$detected_lua" != "nil" ]
