projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.6->0.7
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index 0f705b62bc905cd4f1019b6cf049f7dede10f54c..46f3331f004bc9030f5866c5c50a6bcb3e104dc2 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-22,6
+22,9
@@
if CFG_SOURCEDIR then
package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath;
end
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
-- Substitute ~ with path to home directory in data path
if CFG_DATADIR then
if os.getenv("HOME") then