changeset 4013:b427290fb6bc

- Added missing dependencies for the CHANGES{,ru} targets. - Pass string params to xsltproc. - Removed extraneous rule bodies.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 19 Aug 2011 08:33:47 +0000
parents bf452af6c1d2
children 234907e676a5
files docs/GNUmakefile
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/docs/GNUmakefile
+++ b/docs/GNUmakefile
@@ -29,21 +29,23 @@ changes:	$(TEMP)/$(NGINX)/CHANGES.ru				
 
 
 $(TEMP)/$(NGINX)/CHANGES.ru:	docs/xml/nginx/changes.xml		\
+				docs/xml/change_log_conf.xml		\
 				docs/xslt/changes.xslt
 
 	test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX)
 
-	xsltproc --param lang "'ru'"					\
+	xsltproc --stringparam lang ru					\
 		-o $(TEMP)/$(NGINX)/CHANGES.ru				\
 		docs/xslt/changes.xslt docs/xml/nginx/changes.xml
 
 
 $(TEMP)/$(NGINX)/CHANGES:	docs/xml/nginx/changes.xml		\
+				docs/xml/change_log_conf.xml		\
 				docs/xslt/changes.xslt
 
 	test -d $(TEMP)/$(NGINX) || mkdir -p $(TEMP)/$(NGINX)
 
-	xsltproc --param lang "'en'"					\
+	xsltproc --stringparam lang en					\
 		-o $(TEMP)/$(NGINX)/CHANGES				\
 		docs/xslt/changes.xslt docs/xml/nginx/changes.xml
 
@@ -55,16 +57,15 @@ docs/xslt/changes.xslt:		docs/xsls/chang
 html:									\
 	docs/html/http/ngx_http_core_module.html
 
-docs/html/http/ngx_http_core_module.html:				\
-		docs/xml/http/ngx_http_core_module.xml			\
+docs/html/http/%.html:							\
+		docs/xml/http/%.xml					\
 		docs/xslt/module.xslt					\
 		docs/dtd/module.dtd
 	$(call XSLT, docs/xslt/module.xslt, $<, $@)
 
-docs/xslt/module.xslt:		docs/xsls/module.xsls			\
+docs/xslt/module.xslt:							\
 		docs/xslt/directive.xslt				\
 		docs/xslt/content.xslt
-	$(call XSLScript, $<, $@)
 
 docs/xslt/%.xslt:		docs/xsls/%.xsls
 	$(call XSLScript, $<, $@)