# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1291044186 0
# Node ID 569716d0e447483c15c74fba4996bd5563d562d2
# Parent  8baa96142289846ed736287c8658da299062ecfb
add man page in release tarball and fix man building procedure

diff --git a/auto/install b/auto/install
--- a/auto/install
+++ b/auto/install
@@ -74,12 +74,12 @@ esac
 
 cat << END                                                    >> $NGX_MAKEFILE
 
-man:
+manpage:
 	sed -e "s|%%PREFIX%%|$NGX_PREFIX|" \\
 		-e "s|%%PID_PATH%%|$NGX_PID_PATH|" \\
 		-e "s|%%CONF_PATH%%|$NGX_CONF_PATH|" \\
 		-e "s|%%ERROR_LOG_PATH%%|$NGX_ERROR_LOG_PATH|" \\
-		< docs/man/nginx.8 > $NGX_OBJS/nginx.8
+		< man/nginx.8 > $NGX_OBJS/nginx.8
 
 install:	$NGX_OBJS${ngx_dirsep}nginx${ngx_binext} \
 		$NGX_INSTALL_PERL_MODULES
@@ -153,7 +153,7 @@ cat << END >> Makefile
 
 build:
 	\$(MAKE) -f $NGX_MAKEFILE
-	\$(MAKE) -f $NGX_MAKEFILE man
+	\$(MAKE) -f $NGX_MAKEFILE manpage
 
 install:
 	\$(MAKE) -f $NGX_MAKEFILE install
diff --git a/misc/GNUmakefile b/misc/GNUmakefile
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -30,6 +30,7 @@ release:
 	mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
 	mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
 	mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
+	mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX)
 
 	$(MAKE) -f docs/GNUmakefile changes
 
@@ -60,6 +61,7 @@ snapshot:
 	mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
 	mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
 	mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
+	mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX)
 
 	$(MAKE) -f docs/GNUmakefile changes