diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-11-29 18:23:06 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-11-29 18:23:06 +0300 |
| commit | 71948cce0c29a32eaa1b8a5903f6c742801fe18f (patch) | |
| tree | 960388ef0dae98a5383fcdefc0dc9f0d86cc29b6 | |
| parent | 11156c6a3a2126b643ea52ec75d27b9394c6dd5b (diff) | |
add man page in release tarball and fix man building procedure
| -rw-r--r-- | auto/install | 6 | ||||
| -rw-r--r-- | misc/GNUmakefile | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/auto/install b/auto/install index c2283a0e2..6b5a12034 100644 --- 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 index 1b1b55708..1c1a2ff76 100644 --- 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 |