Mercurial > hg > nginx

changeset 3801:569716d0e447

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add man page in release tarball and fix man building procedure
author Igor Sysoev <igor@sysoev.ru>
date Mon, 29 Nov 2010 15:23:06 +0000
parents 8baa96142289
children 62b599022a2f
files auto/install misc/GNUmakefile
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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