mirror of
https://github.com/nginx/nginx.git
synced 2024-12-26 00:41:02 -06:00
Configure: moved NGX_SBIN_PATH variable initialization.
It's now initialized in auto/options like the rest of variables for system paths. As a side effect, the currently unused macro NGX_SBIN_PATH now gets the correct value.
This commit is contained in:
parent
8ab1aa612d
commit
76be6f5d70
@ -20,10 +20,6 @@ case ".$NGX_SBIN_PATH" in
|
||||
./*)
|
||||
;;
|
||||
|
||||
.)
|
||||
NGX_SBIN_PATH=$NGX_PREFIX/sbin/nginx
|
||||
;;
|
||||
|
||||
*)
|
||||
NGX_SBIN_PATH=$NGX_PREFIX/$NGX_SBIN_PATH
|
||||
;;
|
||||
|
@ -525,6 +525,7 @@ if [ ".$NGX_PLATFORM" = ".win32" ]; then
|
||||
fi
|
||||
|
||||
|
||||
NGX_SBIN_PATH=${NGX_SBIN_PATH:-sbin/nginx}
|
||||
NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf}
|
||||
NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
|
||||
NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid}
|
||||
|
Loading…
Reference in New Issue
Block a user