Merge 0.9->trunk

[prosody.git] / tools / openfire2prosody.lua

diff --git a/tools/openfire2prosody.lua b/tools/openfire2prosody.lua
index bdea9a6301b271b3a390276f91e943b0cf24ff32..5ef47602a9b3b7254ef82accbbb7e3fc74ba76ee 100644 (file)
--- a/tools/openfire2prosody.lua
+++ b/tools/openfire2prosody.lua
@@ -9,6 +9,12 @@
 package.path = package.path..";../?.lua";
 package.cpath = package.cpath..";../?.so"; -- needed for util.pposix used in datamanager
 
+local my_name = arg[0];
+if my_name:match("[/\\]") then
+       package.path = package.path..";"..my_name:gsub("[^/\\]+$", "../?.lua");
+       package.cpath = package.cpath..";"..my_name:gsub("[^/\\]+$", "../?.so");
+end
+
 -- ugly workaround for getting datamanager to work outside of prosody :(
 prosody = { };
 prosody.platform = "unknown";