IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

axe --sysconfdir=PATH

Browse Source 
configuration prefix is dirname of --conf-path=PATH
fix paths in default nginx.conf
This commit is contained in:
Igor Sysoev
2007-08-14 19:26:20 +00:00
parent 1dc136cc12
commit 5cf4d1af4e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
auto/options
View File

@@ -124,7 +124,6 @@ do
--prefix=*) NGX_PREFIX="$value" ;;
--sbin-path=*) NGX_SBIN_PATH="$value" ;;
--sysconfdir=*) NGX_CONF_PREFIX="$value" ;;
--conf-path=*) NGX_CONF_PATH="$value" ;;
--error-log-path=*) NGX_ERROR_LOG_PATH="$value";;
--pid-path=*) NGX_PID_PATH="$value" ;;
@@ -242,7 +241,6 @@ cat << END
--prefix=PATH set the installation prefix
--sbin-path=PATH set path to the nginx binary file
--sysconfdir=PATH set the configuration prefix
--conf-path=PATH set path to the nginx.conf file
--error-log-path=PATH set path to the error log
--pid-path=PATH set path to nginx.pid file
@@ -363,7 +361,6 @@ fi
NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx}
NGX_CONF_PREFIX=${NGX_CONF_PREFIX:-$NGX_PREFIX}
case ".$NGX_SBIN_PATH" in
@@ -385,15 +382,18 @@ case ".$NGX_CONF_PATH" in
;;
.)
NGX_CONF_PATH=$NGX_CONF_PREFIX/conf/nginx.conf
NGX_CONF_PATH=$NGX_PREFIX/conf/nginx.conf
;;
*)
NGX_CONF_PATH=$NGX_CONF_PREFIX/$NGX_CONF_PATH
NGX_CONF_PATH=$NGX_PREFIX/$NGX_CONF_PATH
;;
esac
NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
case ".$NGX_PID_PATH" in
./*)
;;