aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-18 11:55:40 +0100
committerKim Alvefur <zash@zash.se>2016-03-18 11:55:40 +0100
commit5092b5f5d2b4a0ae0d8812fa09817b314e995969 (patch)
tree6946e0e43dd34b23c09d076f1a417705b15d71cc /prosody
parent94c745e8e83bcabc945e93ebffb5f5eead5544bf (diff)
parent42f15c4eb2f1b52b886f70eefe9c89697e825529 (diff)
downloadprosody-5092b5f5d2b4a0ae0d8812fa09817b314e995969.tar.gz
prosody-5092b5f5d2b4a0ae0d8812fa09817b314e995969.zip
Merge
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody8
1 files changed, 4 insertions, 4 deletions
diff --git a/prosody b/prosody
index 6a3b50db..9cc32cee 100755
--- a/prosody
+++ b/prosody
@@ -11,10 +11,10 @@
-- Will be modified by configure script if run --
-CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR");
-CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
-CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR");
-CFG_DATADIR=os.getenv("PROSODY_DATADIR");
+CFG_SOURCEDIR=CFG_SOURCEDIR or os.getenv("PROSODY_SRCDIR");
+CFG_CONFIGDIR=CFG_CONFIGDIR or os.getenv("PROSODY_CFGDIR");
+CFG_PLUGINDIR=CFG_PLUGINDIR or os.getenv("PROSODY_PLUGINDIR");
+CFG_DATADIR=CFG_DATADIR or os.getenv("PROSODY_DATADIR");
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --