diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2015-06-10 12:25:31 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2015-06-10 12:25:31 +0300 |
| commit | 76be6f5d700bdc20651e4133378851ec5a147e6b (patch) | |
| tree | e33221d88d82fcc6927a56d46711b972cf37a571 | |
| parent | 8ab1aa612d06ac4476b1cfacc778ba0b71ee99aa (diff) | |
| download | nginx-76be6f5d700bdc20651e4133378851ec5a147e6b.tar.gz nginx-76be6f5d700bdc20651e4133378851ec5a147e6b.zip | |
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.
| -rw-r--r-- | auto/install | 4 | ||||
| -rw-r--r-- | auto/options | 1 |
2 files changed, 1 insertions, 4 deletions
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} |