Diff

prosodyctl @ 7299:b7dea8fd09c7

Merge
author Kim Alvefur <zash@zash.se>
date Fri, 18 Mar 2016 11:55:40 +0100
parent 7297:b34a42a10c9f
child 7302:92d86016e1e3
child 7311:e9526dd3e8fc
line wrap: on
line diff
--- a/prosodyctl	Fri Mar 18 11:51:58 2016 +0100
+++ b/prosodyctl	Fri Mar 18 11:55:40 2016 +0100
@@ -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");
 
 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --