diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-07-29 18:05:45 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-07-29 18:05:45 +0000 |
| commit | a1df416d65167dcb6e472ae11a00ef67e770acec (patch) | |
| tree | e38ad917e9c597f9748ef5fc14c21a59d62bb42e /auto/options | |
| parent | 005124201368a111c85f377bf8636cd161308901 (diff) | |
| download | nginx-a1df416d65167dcb6e472ae11a00ef67e770acec.tar.gz nginx-a1df416d65167dcb6e472ae11a00ef67e770acec.tar.bz2 | |
--sysconfdir=DIR
Diffstat (limited to '')
| -rw-r--r-- | auto/options | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/auto/options b/auto/options index 7fb7131a0..0640f8c84 100644 --- a/auto/options +++ b/auto/options @@ -6,6 +6,7 @@ help=no NGX_PREFIX= NGX_SBIN_PATH= +NGX_CONF_PREFIX= NGX_CONF_PATH= NGX_ERROR_LOG_PATH= NGX_PID_PATH= @@ -123,6 +124,7 @@ 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" ;; @@ -240,6 +242,7 @@ 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 @@ -360,6 +363,7 @@ fi NGX_PREFIX=${NGX_PREFIX:-/usr/local/nginx} +NGX_CONF_PREFIX=${NGX_CONF_PREFIX:-$NGX_PREFIX} case ".$NGX_SBIN_PATH" in @@ -381,11 +385,11 @@ case ".$NGX_CONF_PATH" in ;; .) - NGX_CONF_PATH=$NGX_PREFIX/conf/nginx.conf + NGX_CONF_PATH=$NGX_CONF_PREFIX/conf/nginx.conf ;; *) - NGX_CONF_PATH=$NGX_PREFIX/$NGX_CONF_PATH + NGX_CONF_PATH=$NGX_CONF_PREFIX/$NGX_CONF_PATH ;; esac |