diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-08-14 19:26:20 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-08-14 19:26:20 +0000 |
| commit | 5cf4d1af4e12dbcbac9f718884256ac01dec50be (patch) | |
| tree | 19ea1d864e542298bf50b6843174cbbc3bb47cb6 /auto | |
| parent | 1dc136cc129cae0ca76803bd35de1734325a0b11 (diff) | |
axe --sysconfdir=PATH
configuration prefix is dirname of --conf-path=PATH
fix paths in default nginx.conf
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/options | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/auto/options b/auto/options index 0640f8c8..a9d7a2ae 100644 --- a/auto/options +++ b/auto/options @@ -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 ./*) ;; |