Mercurial > hg > nginx
changeset 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 | 4d25ec8f0adb |
files | auto/install auto/options |
diffstat | 2 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/install Thu Jun 04 13:04:12 2015 +0300 +++ b/auto/install Wed Jun 10 12:25:31 2015 +0300 @@ -20,10 +20,6 @@ ./*) ;; - .) - NGX_SBIN_PATH=$NGX_PREFIX/sbin/nginx - ;; - *) NGX_SBIN_PATH=$NGX_PREFIX/$NGX_SBIN_PATH ;;
--- a/auto/options Thu Jun 04 13:04:12 2015 +0300 +++ b/auto/options Wed Jun 10 12:25:31 2015 +0300 @@ -525,6 +525,7 @@ 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}