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.

---
 Makefile                 | 8 ++++----
 configure                | 7 +++++++
 tools/migration/Makefile | 6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index a1de1b6d..0b704e5a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,14 @@ include config.unix
 
 BIN = $(DESTDIR)$(PREFIX)/bin
 CONFIG = $(DESTDIR)$(SYSCONFDIR)
-MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
-SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
+MODULES = $(DESTDIR)$(LIBDIR)/prosody/modules
+SOURCE = $(DESTDIR)$(LIBDIR)/prosody
 DATA = $(DESTDIR)$(DATADIR)
 MAN = $(DESTDIR)$(PREFIX)/share/man
 
-INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+INSTALLEDSOURCE = $(LIBDIR)/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
-INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
+INSTALLEDMODULES = $(LIBDIR)/prosody/modules
 INSTALLEDDATA = $(DATADIR)
 
 .PHONY: all clean install
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
diff --git a/tools/migration/Makefile b/tools/migration/Makefile
index ae402bd2..713831d2 100644
--- a/tools/migration/Makefile
+++ b/tools/migration/Makefile
@@ -3,13 +3,13 @@ include ../../config.unix
 
 BIN = $(DESTDIR)$(PREFIX)/bin
 CONFIG = $(DESTDIR)$(SYSCONFDIR)
-SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
+SOURCE = $(DESTDIR)$(LIBDIR)/prosody
 DATA = $(DESTDIR)$(DATADIR)
 MAN = $(DESTDIR)$(PREFIX)/share/man
 
-INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+INSTALLEDSOURCE = $(LIBDIR)/prosody
 INSTALLEDCONFIG = $(SYSCONFDIR)
-INSTALLEDMODULES = $(PREFIX)/lib/prosody/modules
+INSTALLEDMODULES = $(LIBDIR)/prosody/modules
 INSTALLEDDATA = $(DATADIR)
 
 SOURCE_FILES = migrator/*.lua
-- 
cgit v1.2.3


From 158dc0f9e1071b627a4928825e4e22d73785cfe8 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Fri, 20 Feb 2015 19:00:01 +0100
Subject: util.datamanager: Check that the global 'prosody' exists before using
 it (fixes nil indexing in use outside of prosody)

---
 util/datamanager.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 4a4d62b3..b82349f1 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -163,7 +163,7 @@ local function atomic_store(filename, data)
 	return nil, msg;
 end
 
-if prosody.platform ~= "posix" then
+if prosody and prosody.platform ~= "posix" then
 	-- os.rename does not overwrite existing files on Windows
 	-- TODO We could use Transactional NTFS on Vista and above
 	function atomic_store(filename, data)
-- 
cgit v1.2.3