diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-03-18 14:03:35 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-03-18 14:03:35 +0000 |
| commit | c7e80a8b0191239b7d7103154d4c079868234e41 (patch) | |
| tree | cc8a353f9fd1d39993e99256dd784e813d0e4153 /prosody | |
| parent | f76d7cdfb91850381b47ec3abfbc280f32136682 (diff) | |
| parent | f739ed2c46827cca1b0b7af08320584886e76283 (diff) | |
| download | prosody-c7e80a8b0191239b7d7103154d4c079868234e41.tar.gz prosody-c7e80a8b0191239b7d7103154d4c079868234e41.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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"); -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- |