IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-27 01:11:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Configure: moved NGX_SBIN_PATH variable initialization.

Browse Source 
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 8ab1aa612d
commit 76be6f5d70
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auto/install
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 NGX_SBIN_PATH=$NGX_PREFIX/$NGX_SBIN_PATH
;; ;;

1
auto/options
View File

@ -525,6 +525,7 @@ if [ ".$NGX_PLATFORM" = ".win32" ]; then
fi fi
NGX_SBIN_PATH=${NGX_SBIN_PATH:-sbin/nginx}
NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf} NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf}
NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH` NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid} NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid}