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:
Ruslan Ermilov 2015-06-10 12:25:31 +03:00
parent ba1eec3b04
commit 05084363d7
2 changed files with 1 additions and 4 deletions

View File

@ -20,10 +20,6 @@ case ".$NGX_SBIN_PATH" in
./*)
;;
.)
NGX_SBIN_PATH=$NGX_PREFIX/sbin/nginx
;;
*)
NGX_SBIN_PATH=$NGX_PREFIX/$NGX_SBIN_PATH
;;

View File

@ -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}