Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Tue, 24 Feb 2015 15:22:09 +0000
changeset 6583 74946f050209
parent 6580 1e749832ed3b (current diff)
parent 6582 5a82ee60e07e (diff)
child 6584 f2a7ad099e01
child 6585 71b5de1d830b
Merge 0.9->0.10
configure file | annotate | diff | comparison | revisions
plugins/mod_admin_telnet.lua file | annotate | diff | comparison | revisions 
--- a/configure	Sun Feb 22 18:44:48 2015 +0100
+++ b/configure	Tue Feb 24 15:22:09 2015 +0000
@@ -138,6 +138,7 @@
       ;;
    --libdir=*)
       LIBDIR="$value"
+      LIBDIR_SET=yes
       ;;
    --datadir=*)
    	DATADIR="$value"
@@ -212,6 +213,11 @@
    fi
 fi
 
+if [ "$PREFIX_SET" = "yes" -a ! "$LIBDIR_SET" = "yes" ]
+then
+   LIBDIR=$PREFIX/lib
+fi
+
 find_program() {
    path="$PATH"
    item="`echo "$path" | sed 's/\([^:]*\):.*/\1/'`"
prosody