# HG changeset patch # User Ruslan Ermilov # Date 1433928331 -10800 # Node ID c983c8dea44c1fb435693c932fd2565cb391c554 # Parent 8807a2369b1a344d32c1eb14ed04f3e1ee471f68 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. diff -r 8807a2369b1a -r c983c8dea44c auto/install --- 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 ;; diff -r 8807a2369b1a -r c983c8dea44c auto/options --- 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}