summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--auto/help14
-rwxr-xr-xconfigure2
-rw-r--r--src/nxt_runtime.c6
3 files changed, 11 insertions, 11 deletions
diff --git a/auto/help b/auto/help
index f7755fed..d7ea5adc 100644
--- a/auto/help
+++ b/auto/help
@@ -7,20 +7,20 @@ cat << END
./configure options:
- --cc=FILE set C compiler file name, default: $CC
+ --cc=FILE set C compiler filename, default: "$CC"
--cc-opt=OPTIONS set additional C compiler options
--ld-opt=OPTIONS set additional linker options
- --prefix=DIRECTORY set prefix for relative path names, no by default
- --pid=FILE set pid file name, default: $NXT_PID
- --log=FILE set log file name, default: $NXT_LOG
- --modules=DIRECTORY set modules directory, default: $NXT_MODULES
+ --prefix=DIRECTORY set prefix for relative pathnames, default: none
+ --pid=FILE set pid filename, default: "$NXT_PID"
+ --log=FILE set log filename, default: "$NXT_LOG"
+ --modules=DIRECTORY set modules directory name, default: "$NXT_MODULES"
--control=ADDRESS set address of control API socket
- default: $NXT_CONTROL
+ default: "$NXT_CONTROL"
--user=USER set non-privileged processes to run as specified user
- default: $NXT_USER
+ default: "$NXT_USER"
--group=GROUP set non-privileged processes to run as specified group
default: user's primary group
diff --git a/configure b/configure
index 4933176c..f9f6eb8b 100755
--- a/configure
+++ b/configure
@@ -35,7 +35,7 @@ CC=${CC:-cc}
NXT_PID="nginext.pid"
NXT_LOG="nginext.log"
-NXT_MODULES="modules"
+NXT_MODULES="modules/"
NXT_CONTROL="unix:control.unit.sock"
NXT_USER="nobody"
NXT_GROUP=
diff --git a/src/nxt_runtime.c b/src/nxt_runtime.c
index 7c2c5fcd..93dad6b6 100644
--- a/src/nxt_runtime.c
+++ b/src/nxt_runtime.c
@@ -811,13 +811,13 @@ nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt)
" --control ADDRESS set address of control API socket\n"
" default: \"" NXT_CONTROL_SOCK "\"\n"
"\n"
- " --pid FILE set pid file name\n"
+ " --pid FILE set pid filename\n"
" default: \"" NXT_PID "\"\n"
"\n"
- " --log FILE set log file name\n"
+ " --log FILE set log filename\n"
" default: \"" NXT_LOG "\"\n"
"\n"
- " --modules DIRECTORY set modules directory\n"
+ " --modules DIRECTORY set modules directory name\n"
" default: \"" NXT_MODULES "\"\n"
"\n"
" --user USER set non-privileged processes to run"