aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2011-08-19 08:33:47 +0000
committerRuslan Ermilov <ru@nginx.com>2011-08-19 08:33:47 +0000
commit88b2c7df31d06bb814d60448df5ac5aa8a688ab0 (patch)
treeac1106e629d0fdf1748a6e58dcea3d6b680b476e
parent65c32b255dbb98a228330090d4ddb889a88994f5 (diff)
downloadnginx-88b2c7df31d06bb814d60448df5ac5aa8a688ab0.tar.gz
nginx-88b2c7df31d06bb814d60448df5ac5aa8a688ab0.zip
- Added missing dependencies for the CHANGES{,ru} targets.
- Pass string params to xsltproc. - Removed extraneous rule bodies.
-rw-r--r--docs/GNUmakefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/GNUmakefile b/docs/GNUmakefile
index abb14601d..548e5b829 100644
--- 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/changes.xsls
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, $<, $@)