From: Ruslan Ermilov <ru@nginx.com>
Date: Wed, 10 Jun 2015 09:25:31 +0000 (+0300)
Subject: Configure: moved NGX_SBIN_PATH variable initialization.
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=76be6f5d700bdc20651e4133378851ec5a147e6b;p=nginx.git

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 --git a/auto/install b/auto/install
index 254f9bce6..f7f686c1a 100644
--- a/auto/install
+++ b/auto/install
@@ -20,10 +20,6 @@ case ".$NGX_SBIN_PATH" in
     ./*)
     ;;
 
-    .)
-        NGX_SBIN_PATH=$NGX_PREFIX/sbin/nginx
-    ;;
-
     *)
         NGX_SBIN_PATH=$NGX_PREFIX/$NGX_SBIN_PATH
     ;;
diff --git a/auto/options b/auto/options
index 6bab052cd..febbc2783 100644
--- a/auto/options
+++ b/auto/options
@@ -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}