[nginx] Configure: moved NGX_SBIN_PATH variable initialization.

Ruslan Ermilov ru at nginx.com
Wed Jun 10 09:30:19 UTC 2015


details:   http://hg.nginx.org/nginx/rev/c983c8dea44c
branches:  
changeset: 6176:c983c8dea44c
user:      Ruslan Ermilov <ru at nginx.com>
date:      Wed Jun 10 12:25:31 2015 +0300
description:
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.

diffstat:

 auto/install |  4 ----
 auto/options |  1 +
 2 files changed, 1 insertions(+), 4 deletions(-)

diffs (25 lines):

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 @@ case ".$NGX_SBIN_PATH" in
     ./*)
     ;;
 
-    .)
-        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 @@ 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}



More information about the nginx-devel mailing list