From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 7 Sep 2009 10:03:15 +0000 (+0000)
Subject: merge r2983:
X-Git-Tag: release-0.7.62~8
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=fbee1711143dc781c790388ebe177066f2d60484;p=nginx.git

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 c17dac612..f876891f8 100644
--- 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"`' \