Merge branch 'master' of github.com:znc/znc

.gitignore

@@ -71,3 +71,5 @@ __pycache__
 *.cmake
 CMakeFiles/
 /CMakeCache.txt
+/install_manifest.txt
+/install_manifest_*.txt

modules/Makefile.in

@@ -88,7 +88,7 @@ FILES    := $(shell echo $(FILES) | sed -e "s:cyrusauth::")
 endif
 cyrusauthLDFLAGS := -lsasl2
 
-TARGETS  := $(addsuffix .so, $(FILES))
+TARGETS  := $(addsuffix .so, $(sort $(FILES)))
 
 CLEAN    += *.so *.o
 

src/main.cpp

@@ -135,24 +135,24 @@ static void GenerateHelp(const char* appname) {
         "\t-h, --help         List available command line options (this page)");
     CUtils::PrintMessage(
         "\t-v, --version      Output version information and exit");
-    CUtils::PrintMessage("\t-f, --foreground   Don't fork into the background");
-    CUtils::PrintMessage(
-        "\t-D, --debug        Output debugging information (Implies -f)");
-    CUtils::PrintMessage(
-        "\t-n, --no-color     Don't use escape sequences in the output");
-    CUtils::PrintMessage(
-        "\t-r, --allow-root   Don't complain if ZNC is run as root");
     CUtils::PrintMessage(
         "\t-c, --makeconf     Interactively create a new config");
     CUtils::PrintMessage(
-        "\t-s, --makepass     Generates a password for use in config");
+        "\t-d, --datadir      Set a different ZNC repository (default is "
+        "~/.znc)");
+    CUtils::PrintMessage(
+        "\t-D, --debug        Output debugging information (Implies -f)");
+    CUtils::PrintMessage("\t-f, --foreground   Don't fork into the background");
+    CUtils::PrintMessage(
+        "\t-n, --no-color     Don't use escape sequences in the output");
 #ifdef HAVE_LIBSSL
     CUtils::PrintMessage(
         "\t-p, --makepem      Generates a pemfile for use with SSL");
 #endif /* HAVE_LIBSSL */
     CUtils::PrintMessage(
-        "\t-d, --datadir      Set a different ZNC repository (default is "
-        "~/.znc)");
+        "\t-r, --allow-root   Don't complain if ZNC is run as root");
+    CUtils::PrintMessage(
+        "\t-s, --makepass     Generates a password for use in config");
 }
 
 class CSignalHandler {