Mercurial > hg > nginx
comparison auto/options @ 6176:c983c8dea44c
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.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 10 Jun 2015 12:25:31 +0300 |
parents | 8807a2369b1a |
children | 0dcef374b8bb |
comparison
equal
deleted
inserted
replaced
6175:8807a2369b1a | 6176:c983c8dea44c |
---|---|
523 if [ ".$NGX_PLATFORM" = ".win32" ]; then | 523 if [ ".$NGX_PLATFORM" = ".win32" ]; then |
524 NGX_WINE=$WINE | 524 NGX_WINE=$WINE |
525 fi | 525 fi |
526 | 526 |
527 | 527 |
528 NGX_SBIN_PATH=${NGX_SBIN_PATH:-sbin/nginx} | |
528 NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf} | 529 NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf} |
529 NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH` | 530 NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH` |
530 NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid} | 531 NGX_PID_PATH=${NGX_PID_PATH:-logs/nginx.pid} |
531 NGX_LOCK_PATH=${NGX_LOCK_PATH:-logs/nginx.lock} | 532 NGX_LOCK_PATH=${NGX_LOCK_PATH:-logs/nginx.lock} |
532 | 533 |