Software /
code /
prosody
Diff
configure @ 6581:f2a7ad099e01
Merge 0.10->trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Tue, 24 Feb 2015 15:22:34 +0000 |
parent | 6580:74946f050209 |
child | 6634:3e226e387a67 |
line wrap: on
line diff
--- a/configure Mon Feb 23 00:30:01 2015 +0000 +++ b/configure Tue Feb 24 15:22:34 2015 +0000 @@ -4,6 +4,7 @@ PREFIX=/usr/local SYSCONFDIR="$PREFIX/etc/prosody" +LIBDIR="$PREFIX/lib" DATADIR="$PREFIX/var/lib/prosody" LUA_SUFFIX="" LUA_DIR="/usr" @@ -36,6 +37,8 @@ Default is $PREFIX --sysconfdir=DIR Location where the config file should be installed. Default is \$PREFIX/etc/prosody +--libdir=DIR Location where the server files should be stored. + Default is \$PREFIX/lib --datadir=DIR Location where the server data should be stored. Default is \$PREFIX/var/lib/prosody --lua-suffix=SUFFIX Versioning suffix to use in Lua filenames. @@ -133,6 +136,10 @@ LUA_INCDIR="/usr/local/include"; fi ;; + --libdir=*) + LIBDIR="$value" + LIBDIR_SET=yes + ;; --datadir=*) DATADIR="$value" DATADIR_SET=yes @@ -206,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/'`" @@ -337,6 +349,7 @@ PREFIX=$PREFIX SYSCONFDIR=$SYSCONFDIR +LIBDIR=$LIBDIR DATADIR=$DATADIR LUA_SUFFIX=$LUA_SUFFIX LUA_DIR=$LUA_DIR