From 83ca1bd5d19665f0533137220f2e3736dfec3f62 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 20 Feb 2015 15:51:05 +0000
Subject: configure, Makefile: Add --libdir option to ./configure, allowing you
 to override the $PREFIX/lib/ default. Fixes #470.

---
 configure | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 822b046e..c27517fc 100755
--- a/configure
+++ b/configure
@@ -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 @@ Configure Prosody prior to building.
                             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.
@@ -134,6 +137,9 @@ do
         then LUA_INCDIR="/usr/local/include";
         fi
       ;;
+   --libdir=*)
+      LIBDIR="$value"
+      ;;
    --datadir=*)
    	DATADIR="$value"
    	DATADIR_SET=yes
@@ -338,6 +344,7 @@ cat <<EOF > config.unix
 
 PREFIX=$PREFIX
 SYSCONFDIR=$SYSCONFDIR
+LIBDIR=$LIBDIR
 DATADIR=$DATADIR
 LUA_SUFFIX=$LUA_SUFFIX
 LUA_DIR=$LUA_DIR
-- 
cgit v1.2.3


From dee60b3659ffc63332d0ee011a687aba24b71f26 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Tue, 24 Feb 2015 15:19:20 +0000
Subject: configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is
 set and --libdir isn't (thanks Medics)

---
 configure | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index c27517fc..199f5fcf 100755
--- a/configure
+++ b/configure
@@ -139,6 +139,7 @@ do
       ;;
    --libdir=*)
       LIBDIR="$value"
+      LIBDIR_SET=yes
       ;;
    --datadir=*)
    	DATADIR="$value"
@@ -213,6 +214,11 @@ then
    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/'`"
-- 
cgit v1.2.3