aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-29 18:11:37 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-29 18:11:37 +0100
commit041209a264222c8261ccff51df5f73bbbc23d6b8 (patch)
treee014c22f857a0d2e2f96e817efc59cf6d9642e15 /prosody
parent5dfe9cf891dc5becd805dfbad79653d9eb840001 (diff)
parent273fa0fd8ac62a9f877033c659596fac911b4717 (diff)
downloadprosody-041209a264222c8261ccff51df5f73bbbc23d6b8.tar.gz
prosody-041209a264222c8261ccff51df5f73bbbc23d6b8.zip
Merge with 0.5
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody4
1 files changed, 2 insertions, 2 deletions
diff --git a/prosody b/prosody
index e9f00598..0618a1f3 100755
--- a/prosody
+++ b/prosody
@@ -9,9 +9,9 @@
-- Will be modified by configure script if run --
-CFG_SOURCEDIR=nil;
+CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
-CFG_PLUGINDIR=nil;
+CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
CFG_DATADIR=os.getenv("PROSODY_DATADIR");
-- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --