Merge 0.6.2/waqas with 0.6.2/MattJ

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 4b016e504e3d9c60c60670704027c2ba8f6f974e..b13369a94cdeafb5994fb9ee357f2d92fcac6944 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -22,6 +22,9 @@ if CFG_SOURCEDIR then
        package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
 end
 
+package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua";
+package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so";
+
 -- Substitute ~ with path to home directory in data path
 if CFG_DATADIR then
        if os.getenv("HOME") then