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 254f9bce66a5f4b4469ec10d6ff34997c63ac497..f7f686c1a011d27e9d59371d86b93b284e4ae0d3 100644 (file)
--- 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 6bab052cdb29a9e895d205c22237cd544eefd4f0..febbc2783d0253b1d09b349e103b4c307dfe2f96 100644 (file)
--- 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}