# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1488538342 -3600
# Node ID c92102fe409bfded790b0ff4757b6798e9d235a3
# Parent  36a9a4af1873554f60c7914ab862f6f6c493ba69# Parent  1f4a0e0b71677bcd229a269167d26b6f280c0dc4
Merge 0.10->trunk

diff -r 36a9a4af1873 -r c92102fe409b configure
--- 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" ]