merge r2983:

name of file specified in --conf-path was not honored during installation
the bug had been appeared in r1353

diff --git a/auto/install b/auto/install
index c17dac61270fef62a72f72b1fb74964a22753880..f876891f811463044016054042c4cfb1fedefcb2 100644 (file)
--- a/auto/install
+++ b/auto/install
@@ -102,7 +102,7 @@ install:    $NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
                '\$(DESTDIR)$NGX_CONF_PREFIX/fastcgi_params.default'
 
        test -f '\$(DESTDIR)$NGX_CONF_PATH' \
-               || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX'
+               || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
        cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
 
        test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \