|
 |
530e5a0 |
--- auto/install.orig 2008-05-11 15:02:01.000000000 -0600
|
|
|
530e5a0 |
+++ auto/install 2008-05-11 15:03:54.000000000 -0600
|
|
|
530e5a0 |
@@ -19,45 +19,45 @@
|
|
|
856e45a |
|
|
|
856e45a |
install: $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
|
|
|
856e45a |
$NGX_INSTALL_PERL_MODULES
|
|
|
856e45a |
- test -d '$NGX_PREFIX' || mkdir -p '$NGX_PREFIX'
|
|
|
856e45a |
+ test -d '$NGX_DEST_DIR$NGX_PREFIX' || mkdir -p '$NGX_DEST_DIR$NGX_PREFIX'
|
|
|
856e45a |
|
|
|
856e45a |
- test -d '`dirname "$NGX_SBIN_PATH"`' \
|
|
|
856e45a |
- || mkdir -p '`dirname "$NGX_SBIN_PATH"`'
|
|
|
856e45a |
- test ! -f '$NGX_SBIN_PATH' || mv '$NGX_SBIN_PATH' '$NGX_SBIN_PATH.old'
|
|
|
856e45a |
- cp $NGX_OBJS/nginx '$NGX_SBIN_PATH'
|
|
|
856e45a |
+ test -d '`dirname "$NGX_DEST_DIR$NGX_SBIN_PATH"`' \
|
|
|
856e45a |
+ || mkdir -p '`dirname "$NGX_DEST_DIR$NGX_SBIN_PATH"`'
|
|
|
856e45a |
+ test ! -f '$NGX_DEST_DIR$NGX_SBIN_PATH' || mv '$NGX_DEST_DIR$NGX_SBIN_PATH' '$NGX_DEST_DIR$NGX_SBIN_PATH.old'
|
|
|
856e45a |
+ cp $NGX_OBJS/nginx '$NGX_DEST_DIR$NGX_SBIN_PATH'
|
|
|
856e45a |
|
|
|
530e5a0 |
- test -d '$NGX_CONF_PREFIX' || mkdir -p '$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
+ test -d '$NGX_DEST_DIR$NGX_CONF_PREFIX' || mkdir -p '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
|
|
856e45a |
|
|
|
530e5a0 |
- cp conf/koi-win '$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
- cp conf/koi-utf '$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
- cp conf/win-utf '$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
+ cp conf/koi-win '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
+ cp conf/koi-utf '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
+ cp conf/win-utf '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
|
|
856e45a |
|
|
|
530e5a0 |
- test -f '$NGX_CONF_PREFIX/mime.types' \
|
|
|
530e5a0 |
- || cp conf/mime.types '$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
- cp conf/mime.types '$NGX_CONF_PREFIX/mime.types.default'
|
|
|
530e5a0 |
+ test -f '$NGX_DEST_DIR$NGX_CONF_PREFIX/mime.types' \
|
|
|
530e5a0 |
+ || cp conf/mime.types '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
+ cp conf/mime.types '$NGX_DEST_DIR$NGX_CONF_PREFIX/mime.types.default'
|
|
|
856e45a |
|
|
|
530e5a0 |
- test -f '$NGX_CONF_PREFIX/fastcgi_params' \
|
|
|
530e5a0 |
- || cp conf/fastcgi_params '$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
- cp conf/fastcgi_params '$NGX_CONF_PREFIX/fastcgi_params.default'
|
|
|
530e5a0 |
+ test -f '$NGX_DEST_DIR$NGX_CONF_PREFIX/fastcgi_params' \
|
|
|
530e5a0 |
+ || cp conf/fastcgi_params '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
+ cp conf/fastcgi_params '$NGX_DEST_DIR$NGX_CONF_PREFIX/fastcgi_params.default'
|
|
|
530e5a0 |
|
|
|
530e5a0 |
- test -f '$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
- cp conf/nginx.conf '$NGX_CONF_PREFIX/nginx.conf.default'
|
|
|
530e5a0 |
+ test -f '$NGX_DEST_DIR$NGX_CONF_PATH' || cp conf/nginx.conf '$NGX_DEST_DIR$NGX_CONF_PREFIX'
|
|
|
530e5a0 |
+ cp conf/nginx.conf '$NGX_DEST_DIR$NGX_CONF_PREFIX/nginx.conf.default'
|
|
|
856e45a |
|
|
|
856e45a |
- test -d '`dirname "$NGX_PID_PATH"`' \
|
|
|
856e45a |
- || mkdir -p '`dirname "$NGX_PID_PATH"`'
|
|
|
856e45a |
+ test -d '`dirname "$NGX_DEST_DIR$NGX_PID_PATH"`' \
|
|
|
856e45a |
+ || mkdir -p '`dirname "$NGX_DEST_DIR$NGX_PID_PATH"`'
|
|
|
856e45a |
|
|
|
856e45a |
- test -d '`dirname "$NGX_HTTP_LOG_PATH"`' || \
|
|
|
856e45a |
- mkdir -p '`dirname "$NGX_HTTP_LOG_PATH"`'
|
|
|
856e45a |
+ test -d '`dirname "$NGX_DEST_DIR$NGX_HTTP_LOG_PATH"`' || \
|
|
|
856e45a |
+ mkdir -p '`dirname "$NGX_DEST_DIR$NGX_HTTP_LOG_PATH"`'
|
|
|
856e45a |
|
|
|
856e45a |
- test -d '$NGX_PREFIX/html' || cp -r html '$NGX_PREFIX'
|
|
|
856e45a |
+ test -d '$NGX_DEST_DIR$NGX_PREFIX/html' || cp -r html '$NGX_DEST_DIR$NGX_PREFIX'
|
|
|
856e45a |
END
|
|
|
856e45a |
|
|
|
856e45a |
|
|
|
856e45a |
-if test -n "$NGX_ERROR_LOG_PATH"; then
|
|
|
530e5a0 |
+if test -n "$NGX_DEST_DIR$NGX_ERROR_LOG_PATH"; then
|
|
|
856e45a |
cat << END >> $NGX_MAKEFILE
|
|
|
856e45a |
|
|
|
856e45a |
- test -d '`dirname "$NGX_ERROR_LOG_PATH"`' || \
|
|
|
856e45a |
- mkdir -p '`dirname "$NGX_ERROR_LOG_PATH"`'
|
|
|
530e5a0 |
+ test -d '`dirname "$NGX_DEST_DIR$NGX_ERROR_LOG_PATH"`' || \
|
|
|
530e5a0 |
+ mkdir -p '`dirname "$NGX_DEST_DIR$NGX_ERROR_LOG_PATH"`'
|
|
|
856e45a |
END
|
|
|
856e45a |
|
|
|
856e45a |
fi
|