Merge 0.10->trunk

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 6a3b50db1c72e66548f637165911b568534e6918..ade85f80af1126c8697c5fd1d8a6eb66dc64de2a 100755 (executable)
--- 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");
 
 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
@@ -111,7 +111,7 @@ function read_config()
                        print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist");
                        print("Copy or rename it to prosody.cfg.lua and edit as necessary.");
                end
-               print("More help on configuring Prosody can be found at http://prosody.im/doc/configure");
+               print("More help on configuring Prosody can be found at https://prosody.im/doc/configure");
                print("Good luck!");
                print("**************************");
                print("");