Software / code / prosody
Changeset
6580:74946f050209
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Feb 2015 15:22:09 +0000 |
| parents | 6577:1e749832ed3b (current diff) 6579:5a82ee60e07e (diff) |
| children | 6581:f2a7ad099e01 6582:71b5de1d830b |
| files | configure plugins/mod_admin_telnet.lua |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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/'`"
